From 4831125504f4c7f6e051c6a9e0a3644df76b0c72 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Mon, 26 Feb 2024 12:05:08 +0100
Subject: [PATCH] INTERCOM - ZEN._ZONE_.memory.sh

---
 RUNTIME/SECTOR.refresh.sh    | 19 ++++----
 RUNTIME/ZEN.SECTOR.memory.sh | 95 ++++++++++++++++++++++++++++++++++++
 RUNTIME/ZEN.memory.sh        | 55 ---------------------
 3 files changed, 105 insertions(+), 64 deletions(-)
 create mode 100755 RUNTIME/ZEN.SECTOR.memory.sh
 delete mode 100755 RUNTIME/ZEN.memory.sh

diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh
index 5cf709b5..81124107 100755
--- a/RUNTIME/SECTOR.refresh.sh
+++ b/RUNTIME/SECTOR.refresh.sh
@@ -102,8 +102,8 @@ for SECTOR in ${SECTORS[@]}; do
         echo "(╥☁╥ ) swarm memory empty (╥☁╥ )"
         # Try retieve memory from UPlanet Zen Memory
         [[ ${ZEN} -gt 0 ]] \
-            && echo "Refreshing from ZEN MEMORY" \
-            && ${MY_PATH}/../RUNTIME/ZEN.memory.sh "${SECTOR}" "${MOATS}"
+            && echo "INTERCOM Refreshing from ZEN MEMORY" \
+            && ${MY_PATH}/../RUNTIME/ZEN.SECTOR.memory.sh "${SECTOR}" "${MOATS}"
     fi
     # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     end=`date +%s`
@@ -287,6 +287,7 @@ for SECTOR in ${SECTORS[@]}; do
     REGLON=$(echo ${SLON} | cut -d '.' -f 1)
     REGION="_${REGLAT}_${REGLON}"
     TODATEREGIONNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}")
+    REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}")
 
     PHONEBOOTH="${G1PUB::30}"
     cat ${MY_PATH}/../templates/UPlanetSector/index.html \
@@ -322,14 +323,14 @@ for SECTOR in ${SECTORS[@]}; do
         && IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${SECTOR}/* | tail -n 1) && echo "ROOT was ${ZCHAIN}"
 ######################################################
     ## ZEN CHAINING
-    # Send 1 Zen to UPlanet WORLDG1PUB Wallet containing REGION TW HASH
+    # Send 1 Zen to UPlanet REGIONG1PUB Wallet containing REGION TW HASH
     INTERCOM="UPLANET:${SECTOR}:${TODATE}:/ipfs/${IPFSPOP}"
-    echo "> ${INTERCOM}"
-    if [[ ${ZEN} -gt 0 ]]; then
-        echo "---8<--- SECTOR ZEN CHAINING ---8<------8<----"
-        ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/sector.dunikey "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}"
-        ${MY_PATH}/../tools/PAY4SURE.sh ~/.zen/tmp/${MOATS}/sector.dunikey "0.1" "${WORLDG1PUB}" "${INTERCOM}"
-        rm ~/.zen/tmp/${MOATS}/sector.dunikey
+    echo "> INTERCOM ${INTERCOM} (${ZEN} ZEN)"
+    if [[ ${ZEN} -gt 11 ]]; then
+        echo "---ZZZ-- SECTOR 2 REGION ZEN CHAINING ---ZZZ------ZZZ----"
+        ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/${SECTOR}.dunikey "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}"
+        ${MY_PATH}/../tools/PAY4SURE.sh ~/.zen/tmp/${MOATS}/${SECTOR}.dunikey "0.1" "${REGIONG1PUB}" "${INTERCOM}"
+        rm ~/.zen/tmp/${MOATS}/${SECTOR}.dunikey
     fi
     ##############################################################
     ## PUBLISHING ${SECTOR}
diff --git a/RUNTIME/ZEN.SECTOR.memory.sh b/RUNTIME/ZEN.SECTOR.memory.sh
new file mode 100755
index 00000000..d57bf5ef
--- /dev/null
+++ b/RUNTIME/ZEN.SECTOR.memory.sh
@@ -0,0 +1,95 @@
+################################################################################
+# Author: Fred (support@qo-op.com)
+# Version: 0.1
+# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
+################################################################################
+#~ ZEN.SECTOR.memory.sh
+#~ Search for last "UPLANET:$1:..." in UPLANETG1PUB wallet history
+#~ INTERCOM="UPLANET:${SECTOR}:${TODATE}:/ipfs/${IPFSPOP}" TX COMMENT are made during SECTOR.refresh.sh
+#~ ~/.zen/tmp/${MOATS}/${SECTOR} <=> "/ipfs/$ipfs_pop"
+################################################################################
+################################################################################
+MY_PATH="`dirname \"$0\"`"              # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+. "${MY_PATH}/../tools/my.sh"
+################################################################################
+
+SECTOR="$1"
+[[ $SECTOR == "" ]] && echo "MISSING SECTOR ADRESS" && exit 1
+MOATS="$2"
+
+## CHECK FOR BAD PARAM
+[[ ! -d ~/.zen/tmp/${MOATS-empty}/${SECTOR-empty}/ ]] \
+    && echo "BAD ~/.zen/tmp/${MOATS}/${SECTOR}" \
+    && exit 1
+
+## STARTING
+start=`date +%s`
+
+## CORRESPONDING REGION UKEY
+LAT=$(echo ${SECTOR} | cut -d '_' -f 2)
+LON=$(echo ${SECTOR} | cut -d '_' -f 3)
+REGLAT=$(echo ${LAT} | cut -d '.' -f 1)
+REGLON=$(echo ${LON} | cut -d '.' -f 1)
+
+REGION="_${REGLAT}_${REGLON}"
+
+REGIONG1PUB=$(${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/${REGION}.priv "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}")
+[[ ! ${REGIONG1PUB} ]] && echo "ERROR generating REGION WALLET" && exit 1
+COINS=$($MY_PATH/../tools/COINScheck.sh ${REGIONG1PUB} | tail -n 1)
+echo "REGION : ${REGION} (${COINS} G1) WALLET : ${REGIONG1PUB}"
+
+## RETRIEVE FROM REGION UKEY
+${MY_PATH}/timeout.sh -t 20 $MY_PATH/jaklis/jaklis.py history -n 300 -p ${REGIONG1PUB} -j \
+    > ~/.zen/tmp/${MOATS}/${REGION}.g1history.json
+
+## SCAN FOR UPLANET:${SECTOR} in TX
+if [[ -s ~/.zen/tmp/${MOATS}/${REGION}.g1history.json ]]; then
+
+    intercom=$(jq -r '.[] | select(.comment | test("UPLANET:'"${SECTOR}"'")) | .comment' ~/.zen/tmp/${MOATS}/${REGION}.g1history.json)
+    ipfs_pop=$(echo "$intercom" | grep -oP 'UPLANET:'"${SECTOR}"':/ipfs/\K[^"]+')
+    todate=$(echo "$intercom" | grep -oP 'UPLANET:'"${SECTOR}"':\K[^:]*')
+    echo "SYNC ~/.zen/tmp/${MOATS}/${SECTOR} <=> /ipfs/$ipfs_pop"
+
+    if [[ $ipfs_pop ]]; then
+        echo "from $todate memory slot"
+        ipfs --timeout 90s get -o ~/.zen/tmp/${MOATS}/${SECTOR} /ipfs/$ipfs_pop
+        end=`date +%s`
+        echo "(${SECTOR}) ${todate} get time : "`expr $end - $start` seconds.
+    else
+        echo "WARNING cannot remember... scan for more TX ??!"
+    fi
+
+else
+    echo "FATAL ERROR cannot access to REGIONG1PUB history"
+    exit 1
+fi
+
+
+#~ ## EXTRACT WORLDG1PUB HISTORY
+#~ ${MY_PATH}/timeout.sh -t 20 $MY_PATH/jaklis/jaklis.py history -n 300 -p ${WORLDG1PUB} -j \
+    #~ > ~/.zen/tmp/${MOATS}/${WORLDG1PUB}.g1history.json
+
+#~ ## SCAN FOR UPLANET:${SECTOR} in TX
+#~ if [[ -s ~/.zen/tmp/${MOATS}/${WORLDG1PUB}.g1history.json ]]; then
+
+    #~ intercom=$(jq -r '.[] | select(.comment | test("UPLANET:'"${SECTOR}"'")) | .comment' ~/.zen/tmp/${MOATS}/${WORLDG1PUB}.g1history.json)
+    #~ ipfs_pop=$(echo "$intercom" | grep -oP 'UPLANET:'"${SECTOR}"':/ipfs/\K[^"]+')
+    #~ todate=$(echo "$intercom" | grep -oP 'UPLANET:'"${SECTOR}"':\K[^:]*')
+    #~ echo "SYNC ~/.zen/tmp/${MOATS}/${SECTOR} <=> /ipfs/$ipfs_pop"
+
+    #~ if [[ $ipfs_pop ]]; then
+        #~ echo "from $todate memory slot"
+        #~ ipfs --timeout 90s get -o ~/.zen/tmp/${MOATS}/${SECTOR} /ipfs/$ipfs_pop
+        #~ end=`date +%s`
+        #~ echo "(${SECTOR}) ${todate} get time : "`expr $end - $start` seconds.
+    #~ else
+        #~ echo "WARNING cannot remember... scan for more TX ??!"
+    #~ fi
+
+#~ else
+    #~ echo "FATAL ERROR cannot access to WORLDG1PUB history"
+    #~ exit 1
+#~ fi
+
+exit 0
diff --git a/RUNTIME/ZEN.memory.sh b/RUNTIME/ZEN.memory.sh
deleted file mode 100755
index eb270f53..00000000
--- a/RUNTIME/ZEN.memory.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-################################################################################
-# Author: Fred (support@qo-op.com)
-# Version: 0.1
-# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
-################################################################################
-#~ ZEN.memory.sh
-#~ Search for last "UPLANET:$1:..." in UPLANETG1PUB wallet history
-#~ INTERCOM="UPLANET:${SECTOR}:${TODATE}:/ipfs/${IPFSPOP}" TX COMMENT are made during SECTOR.refresh.sh
-#~ ~/.zen/tmp/${MOATS}/${SECTOR} <=> "/ipfs/$ipfs_pop"
-################################################################################
-################################################################################
-MY_PATH="`dirname \"$0\"`"              # relative
-MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
-. "${MY_PATH}/../tools/my.sh"
-################################################################################
-
-SECTOR="$1"
-[[ $SECTOR == "" ]] && echo "MISSING SECTOR MEMORY ADRESS" && exit 1
-MOATS="$2"
-
-## CHECK FOR BAD PARAM
-[[ ! -d ~/.zen/tmp/${MOATS-empty}/${SECTOR-empty}/ ]] \
-    && echo "BAD ~/.zen/tmp/${MOATS}/${SECTOR}" \
-    && exit 1
-
-## STARTING
-start=`date +%s`
-
-## EXTRACT WORLDG1PUB HISTORY
-${MY_PATH}/timeout.sh -t 20 $MY_PATH/jaklis/jaklis.py history -n 300 -p ${WORLDG1PUB} -j \
-    > ~/.zen/tmp/${MOATS}/${WORLDG1PUB}.g1history.json
-
-## SCAN FOR UPLANET:${SECTOR} in TX
-if [[ -s ~/.zen/tmp/${MOATS}/${WORLDG1PUB}.g1history.json ]]; then
-
-    intercom=$(jq -r '.[] | select(.comment | test("UPLANET:'"${SECTOR}"'")) | .comment' ~/.zen/tmp/${MOATS}/${WORLDG1PUB}.g1history.json)
-    ipfs_pop=$(echo "$intercom" | grep -oP 'UPLANET:'"${SECTOR}"':/ipfs/\K[^"]+')
-    todate=$(echo "$intercom" | grep -oP 'UPLANET:'"${SECTOR}"':\K[^:]*')
-    echo "SYNC ~/.zen/tmp/${MOATS}/${SECTOR} <=> /ipfs/$ipfs_pop"
-
-    if [[ $ipfs_pop ]]; then
-        echo "from $todate memory slot"
-        ipfs --timeout 90s get -o ~/.zen/tmp/${MOATS}/${SECTOR} /ipfs/$ipfs_pop
-        end=`date +%s`
-        echo "(${SECTOR}) ${todate} get time : "`expr $end - $start` seconds.
-    else
-        echo "WARNING cannot remember... scan for more TX ??!"
-    fi
-
-else
-    echo "FATAL ERROR cannot access to WORLDG1PUB history"
-    exit 1
-fi
-
-exit 0