From 207577868e0f0867b93e883b1e253e81a7777b48 Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 3 May 2024 12:37:42 +0200 Subject: [PATCH] _SALT_ / _PEPPER_ --- ASTROBOT/_ForkUPlanetZERO.sh | 2 +- RUNTIME/G1PalPay.sh | 13 ++++++++----- RUNTIME/VISA.new.sh | 2 ++ templates/UPlanetZINE/day0/index.html | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ASTROBOT/_ForkUPlanetZERO.sh b/ASTROBOT/_ForkUPlanetZERO.sh index 53807bdd..078e80f1 100755 --- a/ASTROBOT/_ForkUPlanetZERO.sh +++ b/ASTROBOT/_ForkUPlanetZERO.sh @@ -94,7 +94,7 @@ echo '' >> $HOME/.zen/tmp/${MOATS}/swarm.key IN16=$(cat ${JSONUPLANET} | jq -r '."${PLAYER}"') ## secret is only decrypted by wish source player [[ ${IN16} == "" || ${IN16} == "null" ]] \ - && IN16=$(cat ${JSONUPLANET} | jq -r ".secret") && echo "get from secret............" + && IN16=$(cat ${JSONUPLANET} | jq -r ".secret") && echo "get IN16 from secret field" if [[ ${IN16} == "" || ${IN16} == "null" ]]; then diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index 10189a97..06c22814 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -51,11 +51,12 @@ mkdir -p $HOME/.zen/game/players/${PLAYER}/G1PalPay/ mkdir -p $HOME/.zen/tmp/${MOATS} echo "=====(•‿‿•)====== ( ◕‿◕) (◕‿◕ ) =======(•‿‿•)======= ${PLAYER} ${INDEX}" -echo "(✜‿‿✜) G1PalPay : CHECK LAST 15 TX comment" +echo "(✜‿‿✜) G1PalPay : CHECK LAST 30 TX comment" -# CHECK LAST 15 INCOMING PAYMENTS +# CHECK LAST 30 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 15 -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 30 -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.........................." @@ -115,7 +116,8 @@ fi 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 +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)... @@ -337,6 +339,7 @@ done < ~/.zen/tmp/${MOATS}/@tags.json echo "=====(•‿‿•)====== ( ◕‿◕) (◕‿◕ ) =======(•‿‿•)=======" -rm -Rf $HOME/.zen/tmp/${MOATS} +# rm -Rf $HOME/.zen/tmp/${MOATS} +ls $HOME/.zen/tmp/${MOATS} exit 0 diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index c0180825..d3d2d222 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -562,6 +562,8 @@ cat ${ZINE} \ -e "s~_ASTRONAUTENS_~${ASTRONAUTENS}~g" \ -e "s~_ASTRODID_~${ipns2did:1}~g" \ -e "s~0448~${PASS}~g" \ + -e "s~_SALT_~${SALT}~g" \ + -e "s~_PEPPER_~${PEPPER}~g" \ -e "s~_IPFSNODEID_~${IPFSNODEID}~g" \ -e "s~_EARTHCID_~${EARTHCID}~g" \ -e "s~_SECTOR_~${SECTOR}~g" \ diff --git a/templates/UPlanetZINE/day0/index.html b/templates/UPlanetZINE/day0/index.html index 0c38f71b..40de8751 100644 --- a/templates/UPlanetZINE/day0/index.html +++ b/templates/UPlanetZINE/day0/index.html @@ -45,6 +45,7 @@ href="/ipfs/QmeegmN4shouhnzvnDYpbSEJtdRsyy39SpL9XqYVHgtN44/style.css" />
AstroID


CODE : 0448 +
_SALT_ / _PEPPER_

/--> SECTOR : _SECTOR_