diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index 74c44a35..92d2da5a 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -19,7 +19,7 @@ ME="${0##*/}" CESIUM=${myCESIUM} GCHANGE=${myGCHANGE} -echo "$ME RUNNING" +echo "$ME RUNNING (•‿‿•)" ######################################################################## # PALPAY SERVICE : MONITOR INCOMING TX & NEW TIDDLERS @@ -47,16 +47,15 @@ MOATS="$3" ################################################################### ## CREATE APP NODE PLAYER PUBLICATION DIRECTORY ################################################################### -mkdir -p $HOME/.zen/tmp/${IPFSNODEID}/G1PalPay/${PLAYER}/ mkdir -p $HOME/.zen/game/players/${PLAYER}/G1PalPay/ mkdir -p $HOME/.zen/tmp/${MOATS} -echo "=========== ( ◕‿◕) (◕‿◕ ) ============== ${PLAYER} +echo "=====(•‿‿•)====== ( ◕‿◕) (◕‿◕ ) =======(•‿‿•)======= ${PLAYER} ${INDEX}" -echo "(✜‿‿✜) G1PalPay : CHECK LAST 10 TX comment" +echo "(✜‿‿✜) G1PalPay : CHECK LAST 15 TX comment" -# CHECK LAST 10 INCOMING PAYMENTS +# CHECK LAST 15 INCOMING PAYMENTS ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ -${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -n 10 -j > $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json +${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -n 15 -j > $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json [[ ! -s $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json ]] \ && echo "NO PAYMENT HISTORY.......................... EXIT" \ @@ -64,14 +63,13 @@ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dun ############################## ########################################################## ############# CHECK FOR N1COMMANDs IN PAYMENT COMMENT -# TODO check amout > 0 ################################################################# # LOG / cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -rc .[] -## TREAT ANY COMMENT STARTING WITH N1: +## TREAT ANY COMMENT STARTING WITH N1: exemple : N1Kodi.sh ## EXTRACT /ASTROBOT/N1ProgramNames ls ${MY_PATH}/../ASTROBOT/ | grep "N1" | cut -d "." -f 1 > ~/.zen/tmp/${MOATS}/N1PROG - while read prog; do + echo "# SCAN FOR N1 COMMAND : $prog" cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -rc .[] | grep "$prog" >> ~/.zen/tmp/${MOATS}/myN1.json done < ~/.zen/tmp/${MOATS}/N1PROG @@ -108,13 +106,14 @@ while read NLINE; do done < ~/.zen/tmp/${MOATS}/myN1.json ######################################################################################## -############# CHECK FOR EMAILs IN PAYMENT COMMENT +echo "# CHECK FOR EMAILs IN PAYMENT COMMENT" ## DEBUG ## cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -r ################################################################# cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -rc .[] | grep '@' > ~/.zen/tmp/${MOATS}/myPalPay.json # IF COMMENT CONTAINS EMAIL ADDRESSES -# SPREAD & TRANSFER AMOUNT TO NEXT (REMOVING IT FROM LIST)... Other G1PalPay will continue the transmission... +# SPREAD & TRANSFER AMOUNT TO NEXT (REMOVING IT FROM LIST)... +## Other G1PalPay will continue the transmission... ######################################################################## ## GET @ in JSON INLINE while read LINE; do @@ -134,18 +133,21 @@ while read LINE; do ## GET EMAILS FROM COMMENT TXIMAILS=($(echo "$COMMENT" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b")) - echo "$TXIDATE $TXIPUBKEY $TXIAMOUNT [$TXIAMOUNTUD] $TXIMAILS % $SHARE %" [[ $(echo "$TXIAMOUNT < 0" | bc) ]] \ - && echo "TX-OUT" \ + && echo "TX-OUT $TXIDATE" \ && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate \ && continue ## DIVIDE INCOMING AMOUNT TO SHARE echo "N=${#TXIMAILS[@]}" N=${#TXIMAILS[@]} + REDIS=0 + REDISMAILS="" + SHAREE=$(echo "scale=2; $TXIAMOUNT / $N" | bc) SHARE=$(makecoord ${SHAREE}) ## SHARE is received AMOUT divided by numbers of EMAILS in comment + echo "% ${#TXIMAILS[@]} % $SHARE % $TXIDATE $TXIPUBKEY $TXIAMOUNT [$TXIAMOUNTUD] $TXIMAILS" # let's loop over TXIMAILS for EMAIL in "${TXIMAILS[@]}"; do @@ -156,6 +158,7 @@ while read LINE; do && continue echo "EMAIL : ${EMAIL}" + ASTROTW="" STAMP="" ASTROG1="" ASTROIPFS="" ASTROFEED="" # RESET VAR $($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}" @@ -168,40 +171,34 @@ while read LINE; do fi [[ ! ${ASTROG1} ]] \ - && echo "