diff --git a/API/UPLANET.sh b/API/UPLANET.sh
index 92858ba9..9cc9dfd7 100755
--- a/API/UPLANET.sh
+++ b/API/UPLANET.sh
@@ -112,7 +112,7 @@ EMAIL="${PLAYER,,}" # lowercase
################################ START WORKING WITH KEYS
### SESSION "$LAT" "$LON" KEY
- ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}"
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "${YESTERDATE}${UPLANETNAME}${LAT}" "${YESTERDATE}${UPLANETNAME}${LON}"
UMAPNS=$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ipns.priv)
ipfs key rm ${MOATS} && echo "$LAT" "$LON" "IPNS key identified"
###
@@ -159,7 +159,7 @@ mkdir -p ~/.zen/tmp/${MOATS}/${LAT}_${LON}
ipfs key rm ${G1PUB} > /dev/null 2>&1
rm ~/.zen/tmp/${MOATS}/_ipns.priv 2>/dev/null
-${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}"
+${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "${YESTERDATE}${UPLANETNAME}${LAT}" "${YESTERDATE}${UPLANETNAME}${LON}"
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ipns.priv )
[[ ! ${UMAPNS} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - UMAPNS COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
@@ -177,8 +177,6 @@ echo VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/
##### (☉_☉ ) #######
${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
-# ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
-
## TO REMOVE : MONITOR
${MY_PATH}/../tools/mailjet.sh "support@qo-op.com" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt "LOG VISA.new $EMAIL" ## Send VISA.new log to EMAIL
@@ -188,15 +186,8 @@ echo "(TW REGISTRATION) Operation time was "`expr $end - $start` seconds.
########################################
-################################################################################
-## WRITE INTO 12345 SWARM CACHE LAYER
-mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_visitors
-echo "" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/index.html
-echo "${EMAIL}:${IPFSROOT}:${MOATS}" >> ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_visitors/${EMAIL}.log
-########################################
-
## Calculating TW IPNS ADDRESS
-TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${EMAIL}" "${NPASS}")
+TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}")
## HTTP nc ON PORT RESPONSE
echo "$HTTPCORS
diff --git a/API/ZONE.sh b/API/ZONE.sh
index bd896cb0..48ae96b2 100755
--- a/API/ZONE.sh
+++ b/API/ZONE.sh
@@ -67,7 +67,7 @@ if [[ $DEG == "0.1" || $DEG == "1" ]]; then
ZONE="_${LAT}_${LON}"
echo "ZONE = ${ZONE}"
ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${ZONE}" "${UPLANETNAME}${ZONE}")
- ZONETW="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${ZONE}" "${UPLANETNAME}${ZONE}")
+ ZONETW="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${YESTERDATE}${UPLANETNAME}${ZONE}" "${YESTERDATE}${UPLANETNAME}${ZONE}")
fi
@@ -78,20 +78,20 @@ if [[ $DEG == "0.01" ]]; then
SECTOR="_${SECLAT}_${SECLON}"
echo "SECTOR = ${SECTOR}"
ZONEG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
- ZONETW="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
+ ZONETW="/ipns/"$(${MY_PATH}/../tools/keygen -t ipfs "${YESTERDATE}${UPLANETNAME}${SECTOR}" "${YESTERDATE}${UPLANETNAME}${SECTOR}")
fi
## UMAP LEVEL
if [[ $DEG == "0.001" ]]; then
- swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/_${LAT}*_${LON}*/TW/* 2>/dev/null | wc -l )
- nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}*_${LON}*/TW/* 2>/dev/null | wc -l )
+ swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/TW/* 2>/dev/null | wc -l )
+ nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}*_${LON}*/TW/* 2>/dev/null | wc -l )
totnum=$(( swarmnum + nodenum ))
echo " ## UMAP _${LAT}*_${LON}* = ${totnum} PLAYERs"
G1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
- ${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 "${YESTERDATE}${UPLANETNAME}${LAT}" "${YESTERDATE}${UPLANETNAME}${LON}"
ipfs key rm ${G1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)
@@ -99,7 +99,7 @@ if [[ $DEG == "0.001" ]]; then
cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
rm -Rf ~/.zen/tmp/${MOATS}/
end=`date +%s`
- echo "(UMAP)_${LAT}_${LON} $UMAPNS Operation time was "`expr $end - $start` seconds.
+ echo "(UMAP)_${LAT}_${LON} ${YESTERDATE} $UMAPNS Operation time was "`expr $end - $start` seconds.
exit 0
fi
@@ -116,9 +116,9 @@ do
ZLON=$(echo "$LON + $DEG * $j" | bc -l )
[[ -z ${ZLON} ]] && ZLON=0
# [[ ! $(echo $ZLON | grep "\." ) ]] && ZLON="${ZLON}."
- echo " ## SEARCH _${ZLAT}*_${ZLON}*"
- swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
- nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ echo " ## SEARCH UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*"
+ swarmnum=$(ls -d ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
+ nodenum=$(ls -d ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${ZLAT}*_${ZLON}*/TW/* 2>/dev/null | wc -l )
totnum=$(( swarmnum + nodenum ))
[[ $totnum -gt 9 ]] && displaynum="X" || displaynum=$totnum
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index 803cbda0..792bc237 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -19,9 +19,11 @@ PLAYERONE="$1"
echo "FOUND : ${PLAYERONE[@]}"
-echo "CLEANING UPLANET KEYS ~/.zen/tmp/${IPFSNODEID}/UPLANET/_*_*"
-rm -Rf ~/.zen/tmp/${IPFSNODEID}/UPLANET/_*_*
-echo "CLEANING TW KEYS ~/.zen/tmp/${IPFSNODEID}/TW/"
+echo "RENEWING UPLANET NODE CACHE
+ ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??"
+rm -Rf ~/.zen/tmp/${IPFSNODEID}/UPLANET
+mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET
+echo "CLEANING TW NODE CACHE ~/.zen/tmp/${IPFSNODEID}/TW/"
rm -Rf ~/.zen/tmp/${IPFSNODEID}/TW/
## RUNING FOR ALL LOCAL PLAYERS
@@ -358,16 +360,29 @@ for PLAYER in ${PLAYERONE[@]}; do
echo "${PLAYER}" \
> ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}.feed.html
- ## Publish on LAT/ON key on IPFSNODEID 12345 CACHE
- [[ ${LAT} && ${LON} ]] \
- && mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/ \
- && cp ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/ \
- && ${MY_PATH}/../tools/json_dir.all.sh ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS \
- && mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/${PLAYER} \
- && cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/${PLAYER}/ \
- && echo "" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_index.html
- ls -al ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON} 2>/dev/null
+ if [[ ${LAT} && ${LON} ]]; then
+ ## SECTOR BANK COORD
+ SECLAT="${LAT::-1}"
+ SECLON="${LON::-1}"
+ ## REGION
+ REGLAT=$(echo ${LAT} | cut -d '.' -f 1)
+ REGLON=$(echo ${LON} | cut -d '.' -f 1)
+
+ ## IPFSNODEID 12345 CACHE UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??
+ mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/
+
+ cp ~/.zen/game/players/${PLAYER}/ipfs/${PLAYER}.rss.json \
+ ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/
+
+ ${MY_PATH}/../tools/json_dir.all.sh ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/RSS/
+ mkdir -p ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER}
+ cp ~/.zen/tmp/${IPFSNODEID}/TW/${PLAYER}/index.html ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/TW/${PLAYER}/
+ echo "" > ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON}/_index.html
+
+ fi
+
+ ls -al ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${REGLAT}_${REGLON}/_${SECLAT}_${SECLON}/_${LAT}_${LON} 2>/dev/null
echo "(☉_☉ ) (☉_☉ ) (☉_☉ )"
## MAINTAIN R/RW TW STATE
diff --git a/RUNTIME/REGION.refresh.sh b/RUNTIME/REGION.refresh.sh
index 7c87a314..7b28585d 100755
--- a/RUNTIME/REGION.refresh.sh
+++ b/RUNTIME/REGION.refresh.sh
@@ -73,6 +73,14 @@ for REGION in ${REGIONS[@]}; do
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}"
ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv)
+
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${YESTERDATE}${UPLANETNAME}${REGION}" "${YESTERDATE}${UPLANETNAME}${REGION}"
+ ipfs key rm ${YESTERDATE}${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
+ YESTERDATEREGIONNS=$(ipfs key import ${YESTERDATE}${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv)
+
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/REGION.priv "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}"
+ ipfs key rm ${TODATE}${REGIONG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
+ TODATEREGIONNS=$(ipfs key import ${TODATE}${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv)
##############################################################
## GET from IPNS
ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${REGION}/ /ipns/${REGIONNS}/
@@ -88,14 +96,14 @@ for REGION in ${REGIONS[@]}; do
[[ $(cat ${RSS}) != "[]" ]] \
&& cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
&& ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
-
done
NL=${#RSSNODE[@]}
## ADD SWARM SECTORS RSS WEEK
RSSWARM=($(ls ~/.zen/tmp/swarm/*/SECTORS/_${REGLAT}*_${REGLON}*.week.rss.json 2>/dev/null))
for RSS in ${RSSWARM[@]}; do
- [[ $(cat ${RSS}) != "[]" ]] && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
+ [[ $(cat ${RSS}) != "[]" ]] \
+ && cp ${RSS} ~/.zen/tmp/${MOATS}/${REGION}/RSS/ \
&& ${MY_PATH}/../tools/RSS2WEEKnewsfile.sh ${RSS} >> ~/.zen/tmp/${MOATS}/${REGION}/JOURNAL
done
NS=${#RSSWARM[@]}
@@ -138,10 +146,10 @@ rm ~/.zen/tmp/${MOATS}/${REGION}/RWEEKCID 2>/dev/null ## TODO REMOVE
> ~/.zen/tmp/${MOATS}/${REGION}/Journal._${REGLAT}_${REGLON}.redir.html
IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${REGION}/* | tail -n 1)
- ipfs name publish -k ${REGIONG1PUB} /ipfs/${IPFSPOP}
+ ipfs name publish -k ${TODATE}${REGIONG1PUB} /ipfs/${IPFSPOP}
- ipfs key rm ${REGIONG1PUB} > /dev/null 2>&1
+ ipfs key rm ${REGIONG1PUB} ${YESTERDATE}${REGIONG1PUB} ${TODATE}${REGIONG1PUB} > /dev/null 2>&1
done
diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh
index 4c8a6a35..1d9544aa 100755
--- a/RUNTIME/SECTOR.refresh.sh
+++ b/RUNTIME/SECTOR.refresh.sh
@@ -56,23 +56,39 @@ for SECTOR in ${SECTORS[@]}; do
SLON=$(echo ${SECTOR} | cut -d '_' -f 3)
##############################################################
- SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
- [[ ! ${SECTORG1PUB} ]] && echo "ERROR generating SECTOR WALLET" && exit 1
- COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1)
- echo "SECTOR : ${SECTOR} (${COINS} G1) WALLET : ${SECTORG1PUB}"
+ G1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
+ [[ ! ${G1PUB} ]] && echo "ERROR generating SECTOR WALLET" && exit 1
+ COINS=$($MY_PATH/../tools/COINScheck.sh ${G1PUB} | tail -n 1)
+ echo "SECTOR : ${SECTOR} (${COINS} G1) WALLET : ${G1PUB}"
ZEN=$(echo "($COINS - 1) * 10" | bc | cut -d '.' -f 1)
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${SECTOR}.priv "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}"
- ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${SECTOR}.priv)
+ ipfs key rm ${G1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
+ SECTORNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${SECTOR}.priv)
rm ~/.zen/tmp/${MOATS}/${SECTOR}.priv
- echo "${myIPFS}/ipns/${SECTORNS}/"
+ echo "ORIGIN : ${myIPFS}/ipns/${SECTORNS}/"
+
+ ###################### SPATIO TEMPORAL KEYS
+ ## YESTERDATE ###############
+ YESTERDATE=$(date -d "yesterday 13:00" '+%Y-%m-%d')
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${YESTERDATE}.priv "${YESTERDATE}${UPLANETNAME}${SECTOR}" "${YESTERDATE}${UPLANETNAME}${SECTOR}"
+ 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}"
+
+ ## TODATE #########################################
+ TODATE=$(date -d "today 13:00" '+%Y-%m-%d')
+ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${TODATE}.priv "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
+ 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}"
+
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
start=`date +%s`
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
#~ ## IPFS GET ONLINE SECTORNS
- ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${SECTORNS}/
+ ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${YESTERDATENS}/
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
end=`date +%s`
echo "_____SECTOR${SECTOR} GET time was "`expr $end - $start` seconds.
@@ -150,10 +166,10 @@ for SECTOR in ${SECTORS[@]}; do
sed -i "s~_SECTOR_~${SECTOR}~g" ${INDEX}
## GET ALL RSS json's AND Feed SECTOR TW with it
- RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null))
+ RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null))
NL=${#RSSNODE[@]}
- RSSWARM=($(ls ~/.zen/tmp/swarm/12D*/UPLANET/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null))
+ RSSWARM=($(ls ~/.zen/tmp/swarm/12D*/UPLANET/__/_*_*/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null))
NS=${#RSSWARM[@]}
combinedrss=("${RSSNODE[@]}" "${RSSWARM[@]}")
@@ -189,8 +205,8 @@ for SECTOR in ${SECTORS[@]}; do
" > ~/.zen/tmp/world.js
floop=1
- SWARMTW=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${SLAT}*_${SLON}*/TW/*/index.html 2>/dev/null))
- NODETW=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${SLAT}*_${SLON}*/TW/*/index.html 2>/dev/null))
+ SWARMTW=($(ls ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_${SLAT}*_${SLON}*/TW/*/index.html 2>/dev/null))
+ NODETW=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_${SLAT}*_${SLON}*/TW/*/index.html 2>/dev/null))
TWFILES=("${SWARMTW[@]}" "${NODETW[@]}")
for TWRED in ${TWFILES[@]}; do
@@ -233,14 +249,14 @@ for SECTOR in ${SECTORS[@]}; do
REGION="_${REGLAT}_${REGLON}"
REGIONNS=$(${MY_PATH}/../tools/keygen -t ipfs "${UPLANETNAME}${REGION}" "${UPLANETNAME}${REGION}")
- PHONEBOOTH="${SECTORG1PUB::30}"
+ PHONEBOOTH="${G1PUB::30}"
cat ${MY_PATH}/../templates/UPlanetSector/index.html \
| sed -e "s~_ZONE_~SECTOR ${SECTOR}~g" \
-e "s~_UPZONE_~REGION ${REGION}~g" \
-e "s~QmYdWBx32dP14XcbXF7hhtDq7Uu6jFmDaRnuL5t7ARPYkW/index_fichiers/world.js~${IAMAP}/world.js~g" \
-e "s~_ZONENS_~${SECTORNS}~g" \
-e "s~_UPZONENS_~${REGIONNS}~g" \
- -e "s~_SECTORG1PUB_~${SECTORG1PUB}~g" \
+ -e "s~_SECTORG1PUB_~${G1PUB}~g" \
-e "s~_PHONEBOOTH_~${PHONEBOOTH}~g" \
-e "s~_EARTHCID_~${EARTHCID}~g" \
-e "s~_DATE_~$(date +%A-%d_%m_%Y)~g" \
@@ -260,8 +276,8 @@ convert -font 'Liberation-Sans' \
-pointsize 80 -fill purple -draw 'text 50,120 "'"${ZEN} Zen"'"' \
-pointsize 30 -fill purple -draw 'text 40, 180 "'"${SECTOR}"'"' \
$MY_PATH/../images/G1WorldMap.png "${HOME}/.zen/tmp/${MOATS}/${SECTOR}.png"
-# CREATE SECTORG1PUB AMZQR
-amzqr ${SECTORG1PUB} -l H -p "$MY_PATH/../images/zenticket.png" -c -n ZENPUB.png -d ~/.zen/tmp/${MOATS}/${SECTOR}/
+# CREATE G1PUB AMZQR
+amzqr ${G1PUB} -l H -p "$MY_PATH/../images/zenticket.png" -c -n ZENPUB.png -d ~/.zen/tmp/${MOATS}/${SECTOR}/
convert ~/.zen/tmp/${MOATS}/${SECTOR}/ZENPUB.png -resize 250 ~/.zen/tmp/${MOATS}/ZENPUB.png
# ADD IT
composite -compose Over -gravity NorthEast -geometry +0+0 ~/.zen/tmp/${MOATS}/ZENPUB.png ~/.zen/tmp/${MOATS}/${SECTOR}.png ~/.zen/tmp/${MOATS}/${SECTOR}/INFO.png
@@ -269,7 +285,7 @@ composite -compose Over -gravity NorthEast -geometry +0+0 ~/.zen/tmp/${MOATS}/ZE
## zday marking
rm ~/.zen/tmp/${MOATS}/${SECTOR}/z* 2>/dev/null
ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/${SECTOR}/CHAIN/_chain | rev | cut -d ':' -f 1 | rev 2>/dev/null)
-echo "" > ~/.zen/tmp/${MOATS}/${SECTOR}/z$(date +%A-%d_%m_%Y).html
+echo "${TODATE} ${SECTOR}" > ~/.zen/tmp/${MOATS}/${SECTOR}/z$(date +%A-%d_%m_%Y).html
###################################################### CHAINING BACKUP
IPFSPOP=$(ipfs add -rwq ~/.zen/tmp/${MOATS}/${SECTOR}/* | tail -n 1)
@@ -283,8 +299,8 @@ echo "" > ~/.z
echo "% START PUBLISHING ${SECTOR} ${myIPFS}/ipns/${SECTORNS}"
start=`date +%s`
- ipfs name publish -k ${SECTORG1PUB} /ipfs/${IPFSPOP}
- ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1
+ ipfs name publish -k ${TODATE}${G1PUB} /ipfs/${IPFSPOP}
+ ipfs key rm ${TODATE}${G1PUB} ${YESYERDATE}${G1PUB} ${G1PUB} > /dev/null 2>&1
end=`date +%s`
echo "_____SECTOR${SECTOR} PUBLISH time was "`expr $end - $start` seconds.
@@ -293,7 +309,6 @@ echo "" > ~/.z
###################################################
## EXTRACT SECTOR LAST WEEK TIDDLERS TO IPFSNODEID CACHE
echo "(☉_☉ ) ${REGION}.week.rss.json (☉_☉ )"
- rm -Rf ~/.zen/tmp/${IPFSNODEID}/REGIONS/ ## TODO REMOVE
mkdir -p ~/.zen/tmp/${IPFSNODEID}/SECTORS/
rm -f ~/.zen/tmp/${IPFSNODEID}/SECTORS/${SECTOR}.week.rss.json
diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh
index eb8b7713..105082ce 100755
--- a/RUNTIME/UPLANET.refresh.sh
+++ b/RUNTIME/UPLANET.refresh.sh
@@ -22,9 +22,9 @@ mkdir ~/.zen/tmp/${MOATS}
############################
## RUNING FOR ALL UMAP FOUND IN STATION MAP CACHE : "_LAT_LON"
- ## SEARCH UMAP (created by PLAYER.refresh.sh)
- MEMAPS=($(ls -t ~/.zen/tmp/${IPFSNODEID}/UPLANET/ 2>/dev/null))
- SWARMMAPS=($(ls -Gd ~/.zen/tmp/swarm/*/UPLANET/* | rev | cut -d '/' -f 1 | rev | sort | uniq 2>/dev/null) )
+ ## SEARCH UMAP (created by PLAYER.refresh.sh) /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??
+ MEMAPS=($(ls -t ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/ 2>/dev/null))
+ SWARMMAPS=($(ls -Gd ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/* | rev | cut -d '/' -f 1 | rev | sort | uniq 2>/dev/null) )
combined=("${MEMAPS[@]}" "${SWARMMAPS[@]}")
unique_combined=($(echo "${combined[@]}" | tr ' ' '\n' | sort -u))
echo "ACTIVATED UMAPS : ${unique_combined[@]}" # "_LAT_LON" directories
@@ -39,28 +39,49 @@ mkdir ~/.zen/tmp/${MOATS}
[[ ${LAT} == "" || ${LON} == "" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue
[[ ${LAT} == "null" || ${LON} == "null" ]] && echo ">> ERROR BAD ${LAT} ${LON}" && continue
+ ## SECTOR BANK COORD
+ SECLAT="${LAT::-1}"
+ SECLON="${LON::-1}"
+ ## REGION
+ REGLAT=$(echo ${LAT} | cut -d '.' -f 1)
+ REGLON=$(echo ${LON} | cut -d '.' -f 1)
+
+ ##############################################################
+ ## UMAP WALLET CHECK
##############################################################
G1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
[[ ! ${G1PUB} ]] && echo "ERROR generating WALLET" && exit 1
COINS=$($MY_PATH/../tools/COINScheck.sh ${G1PUB} | tail -n 1)
echo "UMAP (${COINS} G1) WALLET : ${G1PUB}"
+ ## ORIGIN ##########################################################
+ ## CALCULATE INITIAL UMAP GEOSPACIAL IPNS KEY
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${UMAP}.priv "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}"
- ipfs key rm ${G1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
+ ipfs key rm ${G1PUB} > /dev/null 2>&1
UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv)
- echo "${myIPFS}/ipns/${UMAPNS}"
- ##############################################################
+ echo "ORIGIN : ${myIPFS}/ipns/${UMAPNS}"
+
+ ###################### SPATIO TEMPORAL KEYS
+ ## YESTERDATE ###############
+ ${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}"
+
+ ## TODATE #########################################
+ ${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}"
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- ## IPFS GET ONLINE UMAPNS
+ ## IPFS GET YESTERDATENS
mkdir ~/.zen/tmp/${MOATS}/${UMAP}
- ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${UMAPNS}/
+ ipfs --timeout 180s get -o ~/.zen/tmp/${MOATS}/${UMAP}/ /ipns/${YESTERDATENS}/
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
- ## FORMAT MUTATION CODE TODO REMOVE
- [[ -d ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB} ]] && mv ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB} ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN
## FORMAT CONTROL WARNING
[[ ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN || ! -d ~/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON} ]] \
&& echo ">>> INFO - INTIALIZE UMAP FORMAT - NEW UMAP KEY -" \
@@ -146,7 +167,9 @@ echo "" > ~/
echo ">> NEXT REFRESHER WILL BE $(cat ${UREFRESH} | head -n 1)"
######################################################## # NODE SELECTION in UMAP.refresher
+# %%%%%%%%%% ##################################################
## SECTOR LINKING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>${SLAT}_${SLON}
+# %%%%%%%%%% ##################################################
SLAT="${LAT::-1}"
SLON="${LON::-1}"
SECTOR="_${SLAT}_${SLON}"
@@ -165,12 +188,9 @@ echo "" > ~/
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}
echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}/index.html
- #~ SECTORMAPGEN="${EARTHCID}/map_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}"
- #~ SECTORSATGEN="${EARTHCID}/sat_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}"
- #~ echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Map.html
- #~ echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Sat.html
-
+# %%%%%%%%%% ##################################################
## REGION LINKING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ${RLAT}_${RLON}
+# %%%%%%%%%% ##################################################
RLAT=$(echo ${LAT} | cut -d '.' -f 1)
RLON=$(echo ${LON} | cut -d '.' -f 1)
REGION="_${RLAT}_${RLON}"
@@ -189,22 +209,20 @@ echo "" > ~/
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}
echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}/index.html
- #~ REGIONMAPGEN="${EARTHCID}/map_render.html?southWestLat=${RLAT}&southWestLon=${RLON}°=1&ipns=${REGIONNS}"
- #~ REGIONSATGEN="${EARTHCID}/sat_render.html?southWestLat=${RLAT}&southWestLon=${RLON}°=1&ipns=${REGIONNS}"
- #~ echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}.REGION.Map.html
- #~ echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}.REGION.Sat.html
- rm ~/.zen/tmp/${MOATS}/${UMAP}/${RLAT}_${RLON}.REGION*.html ## CODE CLEANING TODO REMOVE
-
- ## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY
- cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/RSS/ 2>/dev/null
- RSSFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/RSS/*.rss.json 2>/dev/null))
+# %%%%%%%%%% ##################################################
+## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY /UPLANET/__/_*_*/_*.?_*.?/_*.??_*.??
+# %%%%%%%%%% ##################################################
+ cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/RSS/ 2>/dev/null
+ RSSFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/RSS/*.rss.json 2>/dev/null))
for RSSFILE in ${RSSFILES[@]}; do
cp ${RSSFILE} ~/.zen/tmp/${MOATS}/${UMAP}/RSS/
done
+# %%%%%%%%%% ##################################################
## COLLECT TW LINKS FROM NODE & SWARM
- cp -r ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/TW/ 2>/dev/null
- TWFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/TW/*/index.html 2>/dev/null))
+# %%%%%%%%%% ##################################################
+ cp -r ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TW/* ~/.zen/tmp/${MOATS}/${UMAP}/TW/ 2>/dev/null
+ TWFILES=($(ls ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TW/*/index.html 2>/dev/null))
for TWRED in ${TWFILES[@]}; do
ZMAIL=$(echo ${TWRED} | rev | cut -d '/' -f 2 | rev)
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW/${ZMAIL}
@@ -232,20 +250,22 @@ echo "" > ~/
#### NOT WORKING !!!
## GEOLINKING CALCULATE SURROUNDING UMAPS ###############################
- if [[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json ]]; then
+ #~ if [[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json ]]; then
- ${MY_PATH}/../tools/Umap_geolinks.sh "${LAT}" "${LON}" "${UMAP}" "${MOATS}" "${UMAPNS}"
+ #~ ${MY_PATH}/../tools/Umap_geolinks.sh "${LAT}" "${LON}" "${UMAP}" "${MOATS}" "${UMAPNS}"
- fi
- ### SET navigator.html ## MAKE EVOLVE template/umap.html
- cp ${MY_PATH}/../templates/umap.html ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html
- cat ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html | sed "s~Umap~Usat~g" > ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Usat.html
+ #~ fi
+ #~ ### SET navigator.html ## MAKE EVOLVE template/umap.html
+ #~ cp ${MY_PATH}/../templates/umap.html ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html
+ #~ cat ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Umap.html | sed "s~Umap~Usat~g" > ~/.zen/tmp/${MOATS}/${UMAP}/navigator_Usat.html
+#### IS IT USEFUL ?..??
####################################
- ## MAKE GET POI's
+# %%%%%%%%%% ##################################################
+ ## GET FROM WEB2.0 POI's AROUND >>>>>>>>>>>>>>>>>>>>>>>>>
+# %%%%%%%%%% ##################################################
+####################################
echo "################### WEB2.0 SCRAPING TIME >>>>>>>>>>>>>>>>"
-### JSON UMAP SCRAPPING
-####################################
## RECORD P4N SPOT DATA
echo "* park4night : https://www.park4night.com/api/places/around?lat=${LAT}&lng=${LON}&radius=200&filter=%7B%7D&lang=fr"
[[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/p4n.json ]] && touch ~/.zen/tmp/${MOATS}/${UMAP}/p4n.json
@@ -271,17 +291,19 @@ echo "" > ~/
-e "s~http://127.0.0.1:8080~~g" \
> ~/.zen/tmp/${MOATS}/${UMAP}/_index.p4n.html
+# %%%%%%%%%% ##################################################
########################################################
echo "CREATING SPHERICAL LOCATIONS"
- ## PREPARE Ŋ1 WORLD MAP ##################################################################
+# %%%%%%%%%% ##################################################
+ ## PREPARE SPHERE MAP ##################################################################
echo "var examples = {};
examples['locations'] = function() {
var locations = {
" > ~/.zen/tmp/world.js
floop=1
- SWARMTW=($(ls ~/.zen/tmp/swarm/*/UPLANET/_${LAT}_${LON}/TW/*/index.html 2>/dev/null))
- NODETW=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}*_${LON}*/TW/*/index.html 2>/dev/null))
+ SWARMTW=($(ls ~/.zen/tmp/swarm/*/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TW/*/index.html 2>/dev/null))
+ NODETW=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_*_*/_*.?_*.?/_${LAT}_${LON}/TW/*/index.html 2>/dev/null))
TWFILES=("${SWARMTW[@]}" "${NODETW[@]}")
for TWRED in ${TWFILES[@]}; do
@@ -358,19 +380,19 @@ echo "" > ~/
&& cp ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_chain ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_chain.${ZMOATS} \
&& echo "UPDATING MOATS"
- ## DOES CHAIN CHANGED or INIT ?
+ ## MICRO LEDGER CHAIN CHANGED or INIT ?
[[ ${ZCHAIN} != ${UMAPROOT} || ${ZCHAIN} == "" ]] \
&& echo "${MOATS}:${IPFSNODEID}:${UMAPROOT}" > ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_chain \
&& echo "${MOATS}" > ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}:ZEN/_moats \
&& UMAPROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/${UMAP}/* | tail -n 1) && echo "ROOT was ${ZCHAIN}"
- echo "PUBLISHING NEW UMAPROOT : ${myIPFS}/ipfs/${UMAPROOT}"
+ echo "PUBLISHING ${TODATE} UMAPROOT : ${myIPFS}/ipfs/${UMAPROOT}"
- ipfs name publish --key=${G1PUB} /ipfs/${UMAPROOT}
+ ipfs name publish --key=${TODATE}${G1PUB} /ipfs/${UMAPROOT}
end=`date +%s`
- ipfs key rm ${G1PUB} ## REMOVE IPNS KEY
+ ipfs key rm ${TODATE}${G1PUB} ${YESYERDATE}${G1PUB} ${G1PUB} ## REMOVE IPNS KEY
- echo "(UMAP) ${UMAP} PUBLISH time was "`expr $end - $start` seconds.
+ echo "(UMAP) ${UMAP} ${TODATE} PUBLISH time was "`expr $end - $start` seconds.
done
diff --git a/install.sh b/install.sh
index 2443b1e3..96340630 100755
--- a/install.sh
+++ b/install.sh
@@ -193,7 +193,7 @@ echo "## ADDING lazydocker ================"
sudo usermod -aG docker $USER
# INSTALL lazydocker GUI
curl https://raw.githubusercontent.com/\
-papiche/lazydocker/master/scripts/\
+jesseduffield/lazydocker/master/scripts/\
install_update_linux.sh | bash
echo "#############################################"
diff --git a/tools/Umap_geolinks.sh b/tools/Umap_geolinks.sh
index e1d60e4f..34b026b1 100755
--- a/tools/Umap_geolinks.sh
+++ b/tools/Umap_geolinks.sh
@@ -23,11 +23,11 @@ UMAPNS=$5
# North Umap
NLAT=$(echo "${LAT} + 0.01" | bc)
NLON="${LON}"
- NWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$NLAT" "${UPLANETNAME}$NLON")
+ NWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$NLAT" "${YESTERDATE}${UPLANETNAME}$NLON")
[[ ! ${NWALLET} ]] && echo "ERROR generating NWALLET" && exit 1
echo "NORTH UMAP NWALLET : ${NWALLET}"
ipfs key rm ${NWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWALLET.priv "${UPLANETNAME}$NLAT" "${UPLANETNAME}$NLON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWALLET.priv "${YESTERDATE}${UPLANETNAME}$NLAT" "${YESTERDATE}${UPLANETNAME}$NLON"
NUMAPNS=$(ipfs key import ${NWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NWALLET.priv)
ipfs key rm ${NWALLET}
@@ -35,11 +35,11 @@ UMAPNS=$5
# South Umap
SLAT=$(echo "${LAT} - 0.01" | bc)
SLON="${LON}"
- SWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$SLAT" "${UPLANETNAME}$SLON")
+ SWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$SLAT" "${YESTERDATE}${UPLANETNAME}$SLON")
[[ ! ${SWALLET} ]] && echo "ERROR generating SWALLET" && exit 1
echo "SOUTH UMAP SWALLET : ${SWALLET}"
ipfs key rm ${SWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SWALLET.priv "${UPLANETNAME}$SLAT" "${UPLANETNAME}$SLON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SWALLET.priv "${YESTERDATE}${UPLANETNAME}$SLAT" "${YESTERDATE}${UPLANETNAME}$SLON"
SUMAPNS=$(ipfs key import ${SWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SWALLET.priv)
ipfs key rm ${SWALLET}
@@ -47,11 +47,11 @@ UMAPNS=$5
# West Umap
WLAT="${LAT}"
WLON=$(echo "${LON} - 0.01" | bc)
- WWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$WLAT" "${UPLANETNAME}$WLON")
+ WWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$WLAT" "${YESTERDATE}${UPLANETNAME}$WLON")
[[ ! ${WWALLET} ]] && echo "ERROR generating WWALLET" && exit 1
echo "WEST UMAP WWALLET : ${WWALLET}"
ipfs key rm ${WWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WWALLET.priv "${UPLANETNAME}$WLAT" "${UPLANETNAME}$WLON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WWALLET.priv "${YESTERDATE}${UPLANETNAME}$WLAT" "${YESTERDATE}${UPLANETNAME}$WLON"
WUMAPNS=$(ipfs key import ${WWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/WWALLET.priv)
ipfs key rm ${WWALLET}
@@ -59,11 +59,11 @@ UMAPNS=$5
# East Umap
ELAT="${LAT}"
ELON=$(echo "${LON} + 0.01" | bc)
- EWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$ELAT" "${UPLANETNAME}$ELON")
+ EWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$ELAT" "${YESTERDATE}${UPLANETNAME}$ELON")
[[ ! ${EWALLET} ]] && echo "ERROR generating EWALLET" && exit 1
echo "EAST UMAP EWALLET : ${EWALLET}"
ipfs key rm ${EWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/EWALLET.priv "${UPLANETNAME}$ELAT" "${UPLANETNAME}$ELON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/EWALLET.priv "${YESTERDATE}${UPLANETNAME}$ELAT" "${YESTERDATE}${UPLANETNAME}$ELON"
EUMAPNS=$(ipfs key import ${EWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/EWALLET.priv)
ipfs key rm ${EWALLET}
@@ -71,11 +71,11 @@ UMAPNS=$5
# South West Umap
SWLAT=$(echo "${LAT} - 0.01" | bc)
SWLON=$(echo "${LON} - 0.01" | bc)
- SWWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$SWLAT" "${UPLANETNAME}$SWLON")
+ SWWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$SWLAT" "${YESTERDATE}${UPLANETNAME}$SWLON")
[[ ! ${SWWALLET} ]] && echo "ERROR generating SWWALLET" && exit 1
echo "SOUTH WEST UMAP SWWALLET : ${SWWALLET}"
ipfs key rm ${SWWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SWWALLET.priv "${UPLANETNAME}$SWLAT" "${UPLANETNAME}$SWLON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SWWALLET.priv "${YESTERDATE}${UPLANETNAME}$SWLAT" "${YESTERDATE}${UPLANETNAME}$SWLON"
SWUMAPNS=$(ipfs key import ${SWWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SWWALLET.priv)
ipfs key rm ${SWWALLET}
@@ -83,11 +83,11 @@ UMAPNS=$5
# North West Umap
NWLAT=$(echo "${LAT} + 0.01" | bc)
NWLON=$(echo "${LON} - 0.01" | bc)
- NWWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$NWLAT" "${UPLANETNAME}$NWLON")
+ NWWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$NWLAT" "${YESTERDATE}${UPLANETNAME}$NWLON")
[[ ! ${NWWALLET} ]] && echo "ERROR generating NWWALLET" && exit 1
echo "NORTH WEST UMAP NWWALLET : ${NWWALLET}"
ipfs key rm ${NWWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWWALLET.priv "${UPLANETNAME}$NWLAT" "${UPLANETNAME}$NWLON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NWWALLET.priv "${YESTERDATE}${UPLANETNAME}$NWLAT" "${YESTERDATE}${UPLANETNAME}$NWLON"
NWUMAPNS=$(ipfs key import ${NWWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NWWALLET.priv)
ipfs key rm ${NWWALLET}
@@ -95,11 +95,11 @@ UMAPNS=$5
# North East Umap
NELAT=$(echo "${LAT} + 0.01" | bc)
NELON=$(echo "${LON} + 0.01" | bc)
- NEWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$NELAT" "${UPLANETNAME}$NELON")
+ NEWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$NELAT" "${YESTERDATE}${UPLANETNAME}$NELON")
[[ ! ${NEWALLET} ]] && echo "ERROR generating NEWALLET" && exit 1
echo "NORTH EAST UMAP NEWALLET : ${NEWALLET}"
ipfs key rm ${NEWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NEWALLET.priv "${UPLANETNAME}$NELAT" "${UPLANETNAME}$NELON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/NEWALLET.priv "${YESTERDATE}${UPLANETNAME}$NELAT" "${YESTERDATE}${UPLANETNAME}$NELON"
NEUMAPNS=$(ipfs key import ${NEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/NEWALLET.priv)
ipfs key rm ${NEWALLET}
@@ -107,11 +107,11 @@ UMAPNS=$5
# South East Umap
SELAT=$(echo "${LAT} - 0.01" | bc)
SELON=$(echo "${LON} + 0.01" | bc)
- SEWALLET=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}$SELAT" "${UPLANETNAME}$SELON")
+ SEWALLET=$(${MY_PATH}/keygen -t duniter "${YESTERDATE}${UPLANETNAME}$SELAT" "${YESTERDATE}${UPLANETNAME}$SELON")
[[ ! ${SEWALLET} ]] && echo "ERROR generating SEWALLET" && exit 1
echo "SOUTH EAST UMAP SEWALLET : ${SEWALLET}"
ipfs key rm ${SEWALLET} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT
- ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SEWALLET.priv "${UPLANETNAME}$SELAT" "${UPLANETNAME}$SELON"
+ ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SEWALLET.priv "${YESTERDATE}${UPLANETNAME}$SELAT" "${YESTERDATE}${UPLANETNAME}$SELON"
SEUMAPNS=$(ipfs key import ${SEWALLET} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SEWALLET.priv)
ipfs key rm ${SEWALLET}
diff --git a/tools/my.sh b/tools/my.sh
index 24d9ec9c..4713ab8d 100755
--- a/tools/my.sh
+++ b/tools/my.sh
@@ -486,7 +486,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]]; then
fi
EARTHCID="/ipfs/QmdiU3JrqNXZSVyzysKySZpMAfnWXBFgN9yqqQ1jRAW2vZ"
-FLIPPERCID="${EARTHCID}/coinflip"
+FLIPPERCID="${EARTHCID}/coinflip" ### EASTER EGG
myUPLANET="${myIPFS}${EARTHCID}" ## EMAIL LAT LON KEY
myLIBRA="https://ipfs.asycn.io" ## READ IPFS GATEWAY
@@ -502,3 +502,5 @@ myLIBRA="https://ipfs.asycn.io" ## READ IPFS GATEWAY
## All TW wallet are created with 1 G1 "primal transaction"
## making UPlanet blockchains secured.
########################################
+TODATE=$(date -d "today 13:00" '+%Y-%m-%d')
+YESTERDATE=$(date -d "yesterday 13:00" '+%Y-%m-%d')