diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 46643a41..1aa0cd22 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -90,32 +90,44 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then arr=(${DISCO//[=&]/ }) salt=$(urldecode ${arr[1]} | xargs) pepper=$(urldecode ${arr[3]} | xargs) - echo "$DISCO DECODED" >> ~/.zen/tmp/${MOATS}/disco - - if [[ ${salt} != "" && ${pepper} != "" && ${WHAT} != "" && ${VAL} != "" ]]; then + echo "
${salt}
${pepper}
" >> ~/.zen/tmp/${MOATS}/disco + if [[ ${salt} != "" && ${pepper} != "" ]]; then ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.key "$salt" "$pepper" G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.key | grep 'pub:' | cut -d ' ' -f 2) - ## COMMAND A PAYMENT - if [[ $APPNAME == "pay" ]]; then - if [[ $WHAT =~ ^[0-9]+$ ]]; then + echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${G1PUB}" + ~/.zen/Astroport.ONE/tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin + cat ~/.zen/tmp/${G1PUB}.curcoin + CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1) + echo "CURRENT KEY : $CURCOINS G1" - echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m" - ~/.zen/Astroport.ONE/tools/timeout.sh -t 3 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco + [[ ${WHAT} == "" ]] && echo "
Missing amount
" >> ~/.zen/tmp/${MOATS}/disco + [[ ${VAL} == "" ]] && echo "
Missing Destination PublicKey
" >> ~/.zen/tmp/${MOATS}/disco + if [[ ${WHAT} != "" && ${VAL} != "" && ${CURCOINS} != "null" && ${CURCOINS} != "" ]]; then + ## COMMAND A PAYMENT + if [[ $APPNAME == "pay" ]]; then + if [[ $WHAT =~ ^[0-9]+$ ]]; then + + echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m" + ~/.zen/Astroport.ONE/tools/timeout.sh -t 3 \ + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco + + fi fi - fi + else + echo "
${WHAT} ${VAL} ${CURCOINS} PROBLEM " >> ~/.zen/tmp/${MOATS}/disco + fi else - echo "BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco + echo "
BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco fi else - echo "DATA MISSING" >> ~/.zen/tmp/${MOATS}/disco + echo "
DATA MISSING" >> ~/.zen/tmp/${MOATS}/disco fi echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index 5f3a0089..fc22993e 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -102,7 +102,7 @@ mkdir -p ~/.zen/tmp/$MOATS convert -gravity southeast -pointsize 25 -fill black -draw "text 30,30 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/result.png ## MAKE amzqr WITH astro:// LINK - amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~')" \ + amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~' | tr '+' '_' | jq -Rr @uri)" \ -d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \ -l H \ -p ~/.zen/tmp/${MOATS}/result.png -c diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index c7bd1a28..8c82e448 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -209,8 +209,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" ## Add logo to QRCode cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png - ## MAKE amzqr WITH astro:// LINK - amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~')" \ + ## MAKE amzqr WITH astro:// ---- PGP LINK + amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~' | tr '+' '_' | jq -Rr @uri)" \ -d ~/.zen/tmp/${MOATS} \ -l H \ -p ~/.zen/tmp/${MOATS}/fond.png