diff --git a/ASTROBOT/G1PalPay.sh b/ASTROBOT/G1PalPay.sh index 12ff89a2..94793a89 100755 --- a/ASTROBOT/G1PalPay.sh +++ b/ASTROBOT/G1PalPay.sh @@ -60,20 +60,26 @@ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dun ############# CHECK FOR N1COMMANDs IN PAYMENT COMMENT ################################################################# +## TREAT ANY COMMENT STARTING WITH N1 cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -rc .[] | grep 'N1' > ~/.zen/tmp/${MOATS}/myN1.json + while read NLINE; do + ## COMMENT FORMAT = N1$CMD:$TH:$TRAIL IDATE=$(echo ${NLINE} | jq -r .date) IPUBKEY=$(echo ${NLINE} | jq -r .pubkey) - [[ $(cat ~/.zen/game/players/${PLAYER}/.ndate) -ge $IDATE ]] && echo "N1COMMAND $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue COMMENT=$(echo ${NLINE} | jq -r .comment) - CMD=$(echo ${COMMENT} | cut -d ':' -f 1) + CMD=$(echo ${COMMENT} | cut -d ':' -f 1 | cut -c -12 ) # Maximum 12 characters CMD + + [[ $(cat ~/.zen/game/players/${PLAYER}/.ndate) -ge $IDATE ]] && echo "$CMD $IDATE from $IPUBKEY ALREADY TREATED - continue" && continue + TH=$(echo ${COMMENT} | cut -d ':' -f 2) + TRAIL=$(echo ${COMMENT} | cut -d ':' -f 3-) if [[ -s ${MY_PATH}/${CMD}.sh ]]; then echo "RECEIVED CMD=${CMD} from ${IPUBKEY}" - ${MY_PATH}/${CMD}.sh ${INDEX} ${PLAYER} ${MOATS} ${IPUBKEY} ${TH} + ${MY_PATH}/${CMD}.sh ${INDEX} ${PLAYER} ${MOATS} ${IPUBKEY} ${TH} ${TRAIL} ## WELL DONE . [[ $? == 0 ]] && echo "${CMD} DONE" && echo "$IDATE" > ~/.zen/game/players/${PLAYER}/.ndate ## MEMORIZE LAST IDATE diff --git a/ASTROBOT/N1Kodi.sh b/ASTROBOT/N1Kodi.sh index af44b201..a460b1cd 100755 --- a/ASTROBOT/N1Kodi.sh +++ b/ASTROBOT/N1Kodi.sh @@ -19,6 +19,7 @@ echo "$ME RUNNING" ## DECODE ipfs_one ## SEND MESSAGE TO SOURCEG1PUB ######################################################################## +## THIS SCRIPT IS RUN WHEN A WALLET RECEIVED A TRANSACTION WITH COMMENT STARTING WITH N1Kodi: ######################################################################## INDEX="$1" [[ ! ${INDEX} ]] && INDEX="$HOME/.zen/game/players/.current/ipfs/moa/index.html" diff --git a/README.md b/README.md index a240cc15..e5b89524 100644 --- a/README.md +++ b/README.md @@ -327,7 +327,7 @@ We choose to use "NaCl" (secret1 / secret) 2 key generation, so it is easy to un **(SECRET1/SECRET2) mixing** * If PLAYER key is (SECRET1/SECRET2) and G1PUB and EMAIL + TW - * wishes keys are (SECRET2 / G1WishName) + * wishes keys are (SECRET2 / WishName EMAIL) * sub-wishes are (EMAIL / G1WishName G1PUB) * wish-billets are (EMAIL_dice_words / G1WishName G1PUB) diff --git a/RUNTIME/G1Voeu.sh b/RUNTIME/G1Voeu.sh index acba554a..cf3406ea 100755 --- a/RUNTIME/G1Voeu.sh +++ b/RUNTIME/G1Voeu.sh @@ -52,7 +52,7 @@ mkdir -p ~/.zen/tmp/${MOATS} [[ ! ${TITRE} ]] && read TITRE VoeuName=$(echo "${TITRE}" | sed -r 's/\<./\U&/g' | sed 's/ //g') # VoeuName EST LE TITRE DU VOEU : CapitalGluedWords + EMAIL1 - SECRET2="${VoeuName}" ## SECRET2 est "TitreDuVoeu PLAYER" + SECRET2="${VoeuName} ${PLAYER}" ## SECRET2 est "TitreDuVoeu PLAYER" echo "${SECRET2}" && [[ ! ${SECRET2} ]] && echo "EMPTY SECRET2 - ERROR" && exit 1 @@ -244,14 +244,14 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"${Voeu #~ [[ ! $? == 0 ]] && echo "G1VOEU CESIUM WALLET PROFILE CREATION FAILED !!!!" echo "************************************************************" - echo "Hop, UNE JUNE pour le Voeu ${VoeuName}" - echo ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a 1 -p ${WISHG1PUB} -c \'"${VOEUNS} G1Voeu ${VoeuName}"\' -m - echo "************************************************************" - echo "************************************************************" + #~ echo "COULD LIMIT ON JUNE pour le Voeu ${VoeuName}" + #~ echo ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a 1 -p ${WISHG1PUB} -c \'"${VOEUNS} G1Voeu ${VoeuName}"\' -m + #~ echo "************************************************************" + #~ echo "************************************************************" - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a 1 -p ${WISHG1PUB} -c "$VOEUXNS G1Voeu ${VoeuName}" -m - [[ ! $? == 0 ]] \ - && echo "SOOOOOOOOOOOORRRRRRRY GUY. YOU CANNOT PAY A G1 A NEW WISH - THIS IS FREE TO CHANGE -" + #~ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a 1 -p ${WISHG1PUB} -c "$VOEUXNS G1Voeu ${VoeuName}" -m + #~ [[ ! $? == 0 ]] \ + #~ && echo "SOOOOOOOOOOOORRRRRRRY GUY. YOU CANNOT PAY A G1 A NEW WISH - THIS IS FREE TO CHANGE -" #~ && rm -Rf ~/.zen/game/players/${PLAYER}/voeux/${VoeuName}/${WISHG1PUB} \ #~ && rm -Rf ~/.zen/game/world/${VoeuName}/${WISHG1PUB}/ \ #~ && ipfs key rm ${WISHG1PUB} \ diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh index a777b61b..f0e7784a 100755 --- a/RUNTIME/VOEUX.refresh.sh +++ b/RUNTIME/VOEUX.refresh.sh @@ -222,14 +222,12 @@ do ########################################################################################### ## DATA POST TREATMENT PROGRAM - ## RUN N1Program ASTROBOT PROGRAM - #~ if [[ -s $MY_PATH/../ASTROBOT/N1${WISHNAME}.sh ]]; then - #~ echo "........................ Astrobot N1${WISHNAME}.sh post-treatment found !" + ## RUN Z1Program ASTROBOT PROGRAM + #~ if [[ -s $MY_PATH/../ASTROBOT/Z1${WISHNAME}.sh ]]; then + #~ echo "........................ Astrobot Z1${WISHNAME}.sh post-treatment found !" #~ echo "________________________________ Running it *****" - #~ ${MY_PATH}/../ASTROBOT/N1${WISHNAME}.sh "~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}" "${PLAYER}" "$MOATS" + #~ ${MY_PATH}/../ASTROBOT/Z1${WISHNAME}.sh "~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}" "${PLAYER}" "$MOATS" #~ echo "________________________________ Finished ******" - #~ else - #~ echo "......................... N1${WISHNAME} REGULAR Ŋ1 RSS JSON" #~ fi ###########################################################################################