diff --git a/API/UPLANET.sh b/API/UPLANET.sh
index edc9f220..25ecad6f 100755
--- a/API/UPLANET.sh
+++ b/API/UPLANET.sh
@@ -86,7 +86,7 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
## YES = OPEN TW
[[ ${ASTROTW} ]] \
- && (echo "$HTTPCORS " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
+ && (echo "$HTTPCORS " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
&& exit 0
else
diff --git a/ASTROBOT/G1ForkUplanet.sh b/ASTROBOT/G1ForkUPlanetZERO.sh
similarity index 60%
rename from ASTROBOT/G1ForkUplanet.sh
rename to ASTROBOT/G1ForkUPlanetZERO.sh
index 0d792fc1..fe1d5c8f 100644
--- a/ASTROBOT/G1ForkUplanet.sh
+++ b/ASTROBOT/G1ForkUPlanetZERO.sh
@@ -54,9 +54,22 @@ cat ${JSONWISH} | jq -r
PLAYERPUB=$(cat $HOME/.zen/game/${PLAYER}/secret.dunikey | grep pub | cut -d ' ' -f 2)
[[ "${PLAYERPUB}" == "" ]] && echo "FATAL ERROR PLAYER KEY MISSING" && exit 1
-WISHNAME=$(cat ${JSONWISH} | jq .title) # ForkUPlanet !
-UPNAME=$(cat ${JSONWISH} | jq -r ".name") ## What name is given ?
+WISHNAME=$(cat ${JSONWISH} | jq .title) # ForkUPlanetZERO !
+UPNAME=$(cat ${JSONWISH} | jq -r ".UPname") ## What name is given ?
+[[ "${UPNAME}" == "null" || "${UPNAME}" == "" ]] && echo "FATAL ERROR UPNAME .UPname MISSING" && exit 1
+HASH=$(cat ${JSONWISH} | jq -r ".hash") ## What text hash it has ?
+[[ "${HASH}" == "null" || "${HASH}" == "" ]] && echo "FATAL ERROR UPNAME .hash MISSING" && exit 1
+SECRET=$(cat ${JSONWISH} | jq -r ".secret") ## What is secret ?
+[[ "${SECRET}" == "null" || "${SECRET}" == "" ]] && echo "FATAL ERROR UPNAME .secret MISSING" && exit 1
CONTRACT=$(cat ${JSONWISH} | jq -r ".text") ## What contract is applying ?
+[[ "${CONTRACT}" == "null" || "${CONTRACT}" == "" ]] && CONTRACT="☼☼☼☼☼ floating points ☼☼☼☼☼"
+echo "- CONTRACT -------------------------------------"
+echo $CONTRACT
+echo "--------------------------------------"
+AHAH=$(echo $CONTRACT | sha512sum | cut -d ' ' -f 1)
+
+[[ $AHAH != $HASH ]] && echo "CONTACT CHANGED - INFORMATION"
+
## CHECK EXISTING ${WISHNAME}.${UPNAME}.swarm.key
[[ ! -s $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key ]] \
@@ -67,43 +80,51 @@ echo -e '/key/swarm/psk/1.0.0/\n/base16/' > $HOME/.zen/tmp/${MOATS}/swarm.key
head -c 64 /dev/urandom | od -t x1 -A none - | tr -d '\n ' >> $HOME/.zen/tmp/${MOATS}/swarm.key
echo '' >> $HOME/.zen/tmp/${MOATS}/swarm.key
-## EXTRACT SECRET FROM JSONWISH
-###############################
+## EXTRACT CURRENT SECRET FROM JSONWISH
+########################################
OLD16=$(cat ${JSONWISH} | jq -r ".secret")
-[[ ${OLD16} == "" || ${OLD16} == "null" ]] \
- && echo "NO SECRET FOUND" \
+
+if [[ ${OLD16} == "" || ${OLD16} == "null" ]]; then
+
+ echo "NO SECRET FOUND" \
&& echo "NEW SECRET SWARM.KEY GENERATION" \
&& cat $HOME/.zen/tmp/${MOATS}/swarm.key \
&& cp $HOME/.zen/tmp/${MOATS}/swarm.key $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key \
- && echo "------- NEW ------ ${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key"
+ && echo "------- KEY LOADED -----> ${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key"
-## DEBASE16
-echo "${OLD16}" | base16 -d \
- > ~/.zen/tmp/${MOATS}/swarmkey.crypted
+ ## CREATE SUB WORLD... MONITOR TEXT
-## TRY TO DECODE with PLAYER secret.dunikey
-${MY_PATH}/../tools/natools.py decrypt \
- -f pubsec \
- -k $HOME/.zen/game/${PLAYER}/secret.dunikey \
- -i ~/.zen/tmp/${MOATS}/swarmkey.crypted \
- -o ~/.zen/tmp/${MOATS}/swarmkey.decrypted
+else
+ ## DEBASE16
+ echo "${OLD16}" | base16 -d \
+ > ~/.zen/tmp/${MOATS}/swarmkey.crypted
-[[ $(diff ~/.zen/tmp/${MOATS}/swarmkey.decrypted $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key) ]] \\
- && echo " SWARM AND LOCAL KEY ARE DIFFERENT " && ERR="TW SWARM CHANGED"
+ ## TRY TO DECODE with PLAYER secret.dunikey
+ ${MY_PATH}/../tools/natools.py decrypt \
+ -f pubsec \
+ -k $HOME/.zen/game/${PLAYER}/secret.dunikey \
+ -i ~/.zen/tmp/${MOATS}/swarmkey.crypted \
+ -o ~/.zen/tmp/${MOATS}/swarmkey.decrypted
-## ALWAYS UPDATE PLAYER LOCAL ?!
-cp ~/.zen/tmp/${MOATS}/swarmkey.decrypted \
- $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key
+ [[ $(diff ~/.zen/tmp/${MOATS}/swarmkey.decrypted $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key) ]] \\
+ && echo " SWARM AND LOCAL KEY ARE DIFFERENT " && ERR="TW SWARM CHANGED"
-if [[ "$ERR" == "" ]] ; then
- #~ echo "# CRYPTO ENCODING PLAYER KEY WITH PLAYERPUB
+ ## UPDATE PLAYER LOCAL SWARMKEY FROM VALUE FOUND IN HIS OWN WISH TIDDLER !
+ [[ -s ~/.zen/tmp/${MOATS}/swarmkey.decrypted ]] \
+ && cp ~/.zen/tmp/${MOATS}/swarmkey.decrypted \
+ $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key \
+ || echo "ERROR RELOADING SWARMKEY"
+fi
+
+if [[ "$HAHA" != "" ]] ; then
+ #~ REPLACE SECRET
${MY_PATH}/../tools/natools.py encrypt \
-p ${PLAYERPUB} \
-i $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key \
-o $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key.enc
ENCODING=$(cat $HOME/.zen/game/${PLAYER}/${WISHNAME}.${UPNAME}.swarm.key.enc | base16)
sed -i "s~${OLD16}~${ENCODING}~g" ${JSONWISH}
- echo "ENCODING: ${ENCODING}"
+ echo "${OLD16} : ${ENCODING}"
fi
diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh
index f6baa9e2..7bf8f94f 100755
--- a/tools/make_image_ipfs_index_carousel.sh
+++ b/tools/make_image_ipfs_index_carousel.sh
@@ -85,7 +85,7 @@ if [[ ! -d $img_dir ]]; then
echo "" >> ~/.zen/tmp/carousel/${pub}.button
done < ~/.zen/tmp/${PLAYER}.g1wishes.txt
fi
- echo "" >> ~/.zen/tmp/carousel/${pub}.button
+ echo "" >> ~/.zen/tmp/carousel/${pub}.button
##################