diff --git a/20h12.process.sh b/20h12.process.sh index 70fefd400..78fd88135 100755 --- a/20h12.process.sh +++ b/20h12.process.sh @@ -37,12 +37,14 @@ done echo "TODAY UPlanet landings" ls ~/.zen/tmp/ZONE_* 2>/dev/null -## REMOVE TMP BUT KEEP SWARM and coucou +## REMOVE TMP BUT KEEP swarm, flashmem and coucou mv ~/.zen/tmp/swarm ~/.zen/swarm mv ~/.zen/tmp/coucou ~/.zen/coucou +mv ~/.zen/tmp/flashmem ~/.zen/flashmem rm -Rf ~/.zen/tmp/* mv ~/.zen/swarm ~/.zen/tmp/swarm mv ~/.zen/coucou ~/.zen/tmp/coucou +mv ~/.zen/flashmem ~/.zen/tmp/flashmem ### DELAY _12345 ASTROPORT DURING 20H12 UPDATE ### MOATS=$(date -u +"%Y%m%d%H%M%S%4N") diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index ef0473591..0e9bf1510 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -226,6 +226,21 @@ for PLAYER in ${PLAYERONE[@]}; do LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon) [[ $LON == "null" || $LON == "" ]] && LON="0.00" + SLAT="${LAT::-1}" + SLON="${LON::-1}" + RLAT="$(echo ${LAT} | cut -d '.' -f 1)" + RLON="$(echo ${LON} | cut -d '.' -f 1)" + MYNS=$(cat ~/.zen/tmp/swarm/12D*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/TODATENS | tail -n 1) + # EXTRACT "${G1PUB}:${DEMAINDATE}:${NEXTNS}" + if [[ ${MYNS} != "" ]]; then + echo "UMAP NEXTNS" + cat ~/.zen/tmp/flashmem/${MYNS}/_next.umap + echo "SECTOR NEXTNS" + cat ~/.zen/tmp/flashmem/${MYNS}/_next.sector + echo "REGION NEXTNS" + cat ~/.zen/tmp/flashmem/${MYNS}/_next.region + fi + UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}") ## CALCULATE UMAP TODATENS ################ diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index fa3cb21e1..959c059fa 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -78,20 +78,20 @@ for UMAP in ${unique_combined[@]}; do ## ORIGIN ########################################################## ## CALCULATE INITIAL UMAP GEOSPACIAL IPNS KEY - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${UMAP}.priv "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${UMAP}.priv "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}" ipfs key rm ${G1PUB} > /dev/null 2>&1 UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv) echo "ORIGIN : ${myIPFS}/ipns/${UMAPNS}" ###################### SPATIO TEMPORAL KEYS ## TODATE ######################################### - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${TODATE}.priv "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${TODATE}.priv "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}" ipfs key rm ${TODATE}${G1PUB} > /dev/null 2>&1 TODATENS=$(ipfs key import ${TODATE}${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${TODATE}.priv) echo "TODAY : ${myIPFS}/ipns/${TODATENS}" ## YESTERDATE ############### - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${YESTERDATE}.priv "${YESTERDATE}${UPLANETNAME}${LAT}" "${YESTERDATE}${UPLANETNAME}${LON}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${YESTERDATE}.priv "${YESTERDATE}${UPLANETNAME}${LAT}" "${YESTERDATE}${UPLANETNAME}${LON}" ipfs key rm ${YESTERDATE}${G1PUB} > /dev/null 2>&1 YESTERDATENS=$(ipfs key import ${YESTERDATE}${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${YESTERDATE}.priv) echo "YESTERDAY : ${myIPFS}/ipns/${YESTERDATENS}" @@ -99,8 +99,8 @@ for UMAP in ${unique_combined[@]}; do # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> start=`date +%s` # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - echo "## IPFS GET YESTERDATENS" mkdir ~/.zen/tmp/${MOATS}/${UMAP} + echo "## IPFS GET YESTERDATENS" ipfs --timeout 300s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${YESTERDATENS}/ if [[ $? != 0 ]]; then echo "(╥☁╥ ) swarm online memory empty (╥☁╥ )" @@ -151,15 +151,15 @@ for UMAP in ${unique_combined[@]}; do [[ ! $(echo ${STRAPS[@]} | grep ${ACTINGNODE}) ]] && ACTINGNODE=${STRAPS[0]} # ++++++++++++++++++++ - - - - FIND LAST TREATMENT TIME - ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_moats 2>/dev/null) || ZMOATS=${MOATS} - # ZMOATS SHOULD BE MORE THAT 5 HOURS. - MOATS_SECONDS=$(${MY_PATH}/../tools/MOATS2seconds.sh ${MOATS}) - ZMOATS_SECONDS=$(${MY_PATH}/../tools/MOATS2seconds.sh ${ZMOATS}) - DIFF_SECONDS=$((MOATS_SECONDS - ZMOATS_SECONDS)) - hours=$((DIFF_SECONDS / 3600)) - minutes=$(( (DIFF_SECONDS % 3600) / 60 )) - seconds=$((DIFF_SECONDS % 60)) - echo "UMAP DATA is ${hours} hours ${minutes} minutes ${seconds} seconds " + ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_moats 2>/dev/null) || ZMOATS=${MOATS} + # ZMOATS SHOULD BE MORE THAT 5 HOURS. + MOATS_SECONDS=$(${MY_PATH}/../tools/MOATS2seconds.sh ${MOATS}) + ZMOATS_SECONDS=$(${MY_PATH}/../tools/MOATS2seconds.sh ${ZMOATS}) + DIFF_SECONDS=$((MOATS_SECONDS - ZMOATS_SECONDS)) + hours=$((DIFF_SECONDS / 3600)) + minutes=$(( (DIFF_SECONDS % 3600) / 60 )) + seconds=$((DIFF_SECONDS % 60)) + echo "UMAP DATA is ${hours} hours ${minutes} minutes ${seconds} seconds " # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## IF NOT UPDATED FOR TOO LONG @@ -175,12 +175,12 @@ for UMAP in ${unique_combined[@]}; do echo "------8<-------------8<------------------8<-----------------8<-----------------8<" continue fi - ######################################## - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PASSING THERE MAKE IPFSNODEID UMAP REFRESHER - + ################################################################################ + # ~~~~~~~~~~~~~ GOING FURTHER ~~~ MEANS IPFSNODEID IS UMAP REFRESHER ~~~~~~~~~~~ + ################################################################################ ## NEXT REFRESHER # TODO: INTRODUCE NODE BALANCE AND CHOOSE THE MOST CONFIDENT ONE - rm ${UREFRESH} + rm ${UREFRESH} for STRAP in ${STRAPS[@]}; do echo ${STRAP} >> ${UREFRESH} ## FILL UMAP.refresher file with all STRAPS done @@ -241,6 +241,41 @@ for UMAP in ${unique_combined[@]}; do mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON} echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html + #################################################################################### + ######################## NEXTNS : UMAP, SECTOR, REGION + #################################################################################### + ## UMAP NEXTNS ############### INFORM "PLAYER.refresh.sh" WITH _next.umap + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/next.priv "${DEMAINDATE}${UPLANETNAME}${LAT}" "${DEMAINDATE}${UPLANETNAME}${LON}" + ipfs key rm "next" > /dev/null 2>&1 + NEXTNS=$(ipfs key import "next" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/next.priv) + echo "UMAP NEXTNS : ${myIPFS}/ipns/${NEXTNS}" + ipfs key rm "next" > /dev/null 2>&1 + rm ~/.zen/tmp/${MOATS}/next.priv + echo "${G1PUB}:${DEMAINDATE}:${NEXTNS}" > ~/.zen/tmp/${MOATS}/${UMAP}/_next.umap + + ## SECTOR NEXTNS ############### INFORM "PLAYER.refresh.sh" WITH _next.sector + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/next.priv "${DEMAINDATE}${UPLANETNAME}${SECTOR}" "${DEMAINDATE}${UPLANETNAME}${SECTOR}" + ipfs key rm "next" > /dev/null 2>&1 + NEXTNS=$(ipfs key import "next" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/next.priv) + echo "SECTOR NEXTNS : ${myIPFS}/ipns/${NEXTNS}" + ipfs key rm "next" > /dev/null 2>&1 + rm ~/.zen/tmp/${MOATS}/next.priv + echo "${SECTORG1PUB}:${DEMAINDATE}:${NEXTNS}" > ~/.zen/tmp/${MOATS}/${UMAP}/_next.sector + + ## REGION NEXTNS ############### INFORM "PLAYER.refresh.sh" WITH _next.region + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/next.priv "${DEMAINDATE}${UPLANETNAME}${REGION}" "${DEMAINDATE}${UPLANETNAME}${REGION}" + ipfs key rm "next" > /dev/null 2>&1 + NEXTNS=$(ipfs key import "next" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/next.priv) + echo "REGION NEXTNS : ${myIPFS}/ipns/${NEXTNS}" + ipfs key rm "next" > /dev/null 2>&1 + rm ~/.zen/tmp/${MOATS}/next.priv + echo "${REGIONG1PUB}:${DEMAINDATE}:${NEXTNS}" > ~/.zen/tmp/${MOATS}/${UMAP}/_next.region + #################################################################################### + ### WRITE TO SWARM CACHE + mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/ + echo "${TODATENS}" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/TODATENS + #################################################################################### + # %%%%%%%%%% ################################################## ## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.?? # %%%%%%%%%% ################################################## diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index ede9577a1..3adc83402 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -283,9 +283,6 @@ SECTOR="_${LAT::-1}_${LON::-1}" ### SECTOR = 0.1° Planet Slice in MadeInZion Ti echo "UPlanet 0.1° SECTOR : ${SECTOR}" sed -i "s~_SECTOR_~${SECTOR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html -UMAPNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}") -UMAP="/ipns/${UMAPNS}" - # GET ACTUAL GPS VALUES tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \ --output ~/.zen/tmp/${MOATS} \ @@ -293,21 +290,15 @@ tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \ OLAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat) OLON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon) -OUMAP=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap) # REPLACE WITH NEW LAT LON UMAP sed -i "s~${OLAT}~${LAT}~g" ~/.zen/tmp/${MOATS}/GPS.json sed -i "s~${OLON}~${LON}~g" ~/.zen/tmp/${MOATS}/GPS.json -sed -i "s~${OUMAP}~${UMAP}~g" ~/.zen/tmp/${MOATS}/GPS.json ## Add _SECTORTW_ cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"sectortw": "_SECTORTW_"}' \ > ~/.zen/tmp/${MOATS}/GPStw.json \ && mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json -## INSERT TODATESECTORNS ######################################### -TODATESECTORNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}") -sed -i "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" ~/.zen/tmp/${MOATS}/GPS.json - ########### ## GET OLD16 tiddlywiki \ @@ -549,8 +540,8 @@ echo "

UPlanet : TW

" > ~/.zen/tmp/${MOATS}/ZenCard.html -echo "
-

ZenCard

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

ZenCard

+" >> ~/.zen/tmp/${MOATS}/ZenCard.html asciiart="${MY_PATH}/../images/astroport.art" while IFS= read -r line @@ -580,14 +571,13 @@ echo " } -

UPlanet : AstroID ($PASS)

" > ~/.zen/tmp/${MOATS}/AstroID.html +

UPlanet : AstroID

" > ~/.zen/tmp/${MOATS}/AstroID.html -echo " -

<--> SECTOR : ${SECTOR} <-->

-

SECRET1=\"$SALT\" SECRET2=\"$PEPPER\"

-
AstroID
+echo "AstroID
+

SECRET1=\"$SALT\" SECRET2=\"$PEPPER\" ($PASS)

ASTROPORT : /ipns/${IPFSNODEID}

-Uplanet" >> ~/.zen/tmp/${MOATS}/AstroID.html +

<--> SECTOR : ${SECTOR} <-->

+" >> ~/.zen/tmp/${MOATS}/AstroID.html asciiart="${MY_PATH}/../images/logoastro.art" while IFS= read -r line