diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 672bb0c2..1a4d0a98 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -147,36 +147,49 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then ## COMMAND A PAYMENT if [[ ${WHAT} =~ ^[0-9]+$ ]]; then + ## CREATE game pending TX + mkdir -p $HOME/.zen/game/pending/${G1PUB}/ + echo "UNKNOWN" > $HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX + ######################## ~/.zen/game/pending/*/*_G1WHO+*.TX + echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'G1CARD:${MOATS}' -m" ${MY_PATH}/../tools/timeout.sh -t 5 \ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1CARD:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco #################################### SYSTEM IS NOT DUNITER OVER POOL RESISTANT + if [ $? == 0 ]; then + echo "SENT" > $HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX + ## Make calculation + COINSFILE="$HOME/.zen/tmp/coucou/${G1PUB}.COINS" + DESTFILE="$HOME/.zen/tmp/coucou/${VAL}.COINS" - ## TODO : MEMORIZE TX TO VERIFY ASTRO/DUNITER SYNC - COINSFILE="$HOME/.zen/tmp/${MOATS}/${G1PUB}.COINS" - DESTFILE="$HOME/.zen/tmp/${MOATS}/${VAL}.COINS" - - CUR=$(cat ${COINSFILE}) - [[ ${CUR} != "" && ${CUR} != "null" ]] \ - && echo $((CUR - WHAT)) > ${COINSFILE} \ - || echo "-${WHAT}" > ${COINSFILE} - cat ${COINSFILE} + CUR=$(cat "${COINSFILE}") + if [[ ! -z "$CUR" && "$CUR" != "null" ]]; then + RESULT=$(echo "$CUR - $WHAT" | bc) + echo "$RESULT" > "${COINSFILE}" + else + echo "-${WHAT}" > "${COINSFILE}" + fi + cat "${COINSFILE}" DES=$(cat ${DESTFILE}) [[ ${DES} != "" && ${DES} != "null" ]] \ - && echo $((DES + WHAT)) > ${DESTFILE} \ + && echo "$DES + $WHAT" | bc > ${DESTFILE} \ || echo "${WHAT}" > ${DESTFILE} cat ${DESTFILE} - ## MUST BE DONE BETTER ... + ## VERIFY AND INFORM OR CONFIRM PAYMENT echo "

OPERATION

${G1PUB}
$CUR - ${WHAT}

${VAL}
$DES + ${WHAT}

OK

" >> ~/.zen/tmp/${MOATS}/disco + else + + echo "NOK" > $HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX + fi else - echo "

${WHAT} PROBLEM

" >> ~/.zen/tmp/${MOATS}/disco + echo "

${WHAT} FORMAT ERROR

" >> ~/.zen/tmp/${MOATS}/disco fi else @@ -187,12 +200,12 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then fi if [[ ${APPNAME} == "flipper" ]]; then + ## Open OSM2IPF getreceiver App - LINK="${myIPFS}/ipfs/QmZdhQVfWe1cEk4Uzuhk7CShSYtXbRWh2yB1hsvuaCdAD5?qrcode=${QRCODE}&pass=${PASS}" - ## history & read ## CANNOT USE jaklis CLI formated output (JSON output) - sed "s~_TWLINK_~${LINK}~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/disco - sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/disco - echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/disco + LINK="${myIPFS}${GETRECEIVERCID}/?qrcode=${QRCODE}&pass=${PASS}&coins=${CURCOINS}" + echo "LINK:$LINK" + echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/disco + echo "" >> ~/.zen/tmp/${MOATS}/disco fi diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh index f847917c..136e69d9 100755 --- a/RUNTIME/VOEUX.refresh.sh +++ b/RUNTIME/VOEUX.refresh.sh @@ -40,13 +40,15 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu ## PROTOCOL EVOLUTION RUN & REMOVE rm -Rf ~/.zen/tmp/${IPFSNODEID}/${PLAYER} - ############################### -####### NEED G1 TO RUN +####### NEED G1 / ZEN TO RUN [[ ${COINS} == "null" || ${COINS} == "" ]] \ && echo ">>> ${COINS} : DESACTIVATED - NEED G1 TO REFRESH WISH - EXIT - " \ && exit 0 -echo "%% $COINS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" +echo "%% ${COINS} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + +[ ${COINS} -lt 2 ] && echo ">>> ${COINS} ONLY : 20 ZEN NEEDED TO CONTINUE" && exit 0 + ############################### ## EXTRACT G1Voeu from PLAYER TW echo "Exporting ${PLAYER} TW [tag[G1Voeu]]" diff --git a/templates/G1PalPay/index.html b/templates/G1PalPay/index.html index cf81ab63..65d71f9e 100644 --- a/templates/G1PalPay/index.html +++ b/templates/G1PalPay/index.html @@ -121,8 +121,8 @@ a {      @@ -143,14 +143,14 @@ a {
LOGIN + LOGOUT (★★★★★) Historique Virement - Balance - Zen Coin - LOGOUT + Balance + ZEN
-

"G1Card" pperations

+

"AstroID" operations

@@ -212,7 +212,7 @@ a { var g1pub = document.getElementById("g1pub").value; // MEMORIZE - if ( appname == 'pay') { + if ( appname == 'pay' || appname == 'flipper' ) { document.getElementById("PASS").value = pass; } else { document.getElementById("PASS").value = "PASS"; @@ -240,7 +240,7 @@ a { var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + g1pub ; console.log(myU); - if ( appname == 'login') { + if ( appname == 'login' || appname == 'flipper' ) { homeAstroportStation(myU, 'tab', 5000) } else { homeAstroportStation(myU, 'aframe', 12000) diff --git a/tools/COINScheck.sh b/tools/COINScheck.sh index 18818a95..dc6db619 100755 --- a/tools/COINScheck.sh +++ b/tools/COINScheck.sh @@ -51,12 +51,13 @@ COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS # echo "ACTUAL $COINSFILE CONTAINS" CURCOINS=$(cat $COINSFILE 2>/dev/null) -echo "$CURCOINS G1" +echo "$CURCOINS (G1)" ## NO or NULL RESULT in CACHE : REFRESHING if [[ $CURCOINS == "" || $CURCOINS == "null" ]]; then ( - CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 10 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB} | cut -d '.' -f 1) + CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 10 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB}) + echo "$CURCOINS" > "$COINSFILE" # PREVENT DUNITER DESYNC (KEEPING ASTROPORT LAST KNOWN VALUE) diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index e84eeb36..1b0be72a 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -95,7 +95,7 @@ if [[ ! -d $img_dir ]]; then ## WRITE ON IT : ASK FOR REFILL convert -font 'Liberation-Sans' \ - -pointsize 80 -fill purple -draw 'text 50,120 "'"$COINS Ğ1"'"' \ + -pointsize 80 -fill purple -draw 'text 50,120 "'"$COINS(_) ZEN"'"' \ -pointsize 30 -fill purple -draw 'text 40, 180 "'"$PLAYER"'"' \ -pointsize 14 -fill white -draw 'text 40, 200 "'"${birthdate}"'"' \ "${HOME}/.zen/tmp/one.png" "${HOME}/.zen/tmp/carousel/${pub}.png" \ diff --git a/tools/my.sh b/tools/my.sh index 8a7eed18..d132d0b8 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -469,3 +469,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then haut=$((height-200)) ### fi + +ASTROJSCID="/ipfs/" +LOGINCID="/ipfs/" +GETRECEIVERCID="/ipfs/QmVCAET43hP37XsSsRmj8P3hEJMXpgcdCAxeQhAyDCKpuE"