diff --git a/API/UPLANET.sh b/API/UPLANET.sh index 15796c42..2e7bfb28 100755 --- a/API/UPLANET.sh +++ b/API/UPLANET.sh @@ -97,7 +97,7 @@ else fi PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7) -## RECEIVED PASS +## RECEIVED PASS ## CAN BE USED TO SELECT TW TEMPLATE VAL="$(echo ${VAL} | detox --inline)" ## DETOX VAL [[ ${OBJ} == "g1pub" && ${VAL} != "" ]] && PASS=${VAL} echo "PASS for Umap $LAT $LON is $PASS" @@ -151,8 +151,10 @@ 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 "$LAT" "$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 echo "UMAPNS : ${myIPFS}/ipns/${UMAPNS}" @@ -164,16 +166,7 @@ if [[ ! -f ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html ]]; then echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}" [[ ${ASTROTW} ]] && (echo "$HTTPCORS " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 - ## Create a redirection to PLAYER (EMAIL/PASS) TW - mkdir -p ~/.zen/tmp/${MOATS}/TW/${EMAIL} - - ## CREATE TW LINK /ipns/TWADD NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}.priv "$EMAIL" "$NPASS" - TWADD=$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}.priv) - ipfs key rm ${MOATS} && rm ~/.zen/tmp/${MOATS}.priv - - echo "" > ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html ## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT ( @@ -184,81 +177,6 @@ if [[ ! -f ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html ]]; then fi -# EMAIL have access to the "Key of the Land" -## MAKE A MESSAGE: ACCESS TO THE UMAP KEY & MAP -echo " - - [Astroport] $LAT $LON WELCOME ${EMAIL} - - - -

U Planet ID registration : $LAT/$LON

-

${EMAIL}

-
UPlanet map ImageUPlanet sat Image -
MAP | SAT -
UMap Key Drive
- LOCAL | GLOBAL - -

Umap Visa

-
Umap G1Visa -

Umap Card

-
Umap G1Card -
- - -

See TW's here

- -
Can you decode this key? Want to know how to use a private key in a browser? Contact us. Let's enhance UPLANET.sh together -

ASTROPORT REGISTERED Crypto Commons : $LAT $LON : ${MOATS} : $(date) - " > ~/.zen/tmp/${MOATS}/MESSAGE.html - -### USED BY UPLANET.refresh.sh : inform which IPFSNODEID's are UMAP keepers -UREFRESH="${HOME}/.zen/tmp/${MOATS}/${LAT}_${LON}/UMAP.refresh" -[[ ! $(cat ${UREFRESH} | grep ${IPFSNODEID} ) ]] \ - && echo "${IPFSNODEID}" >> ${UREFRESH} -######################################## - -## TAKING CARE OF THE CHAIN -######################################## -IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1) -######################################## -ZCHAIN=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}/_chain | rev | cut -d ':' -f 1 | rev 2>/dev/null) -ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}/_moats 2>/dev/null) -[[ ${ZCHAIN} && ${ZMOATS} ]] \ - && cp ~/.zen/tmp/${MOATS}/${G1PUB}/_chain ~/.zen/tmp/${MOATS}/${G1PUB}/_chain.${ZMOATS} \ - && echo "UPDATING MOATS" - -## UPDATE HPASS last G1Visa PASS -HPASS=$(echo $PASS | sha512sum | cut -d ' ' -f 1) -echo "${HPASS}" > ~/.zen/tmp/${MOATS}/${G1PUB}/_${EMAIL}.HPASS - -## DOES CHAIN CHANGED or INIT ? -[[ ${ZCHAIN} != ${IPFSROOT} || ${ZCHAIN} == "" ]] \ - && echo "${MOATS}:${IPFSNODEID}:${IPFSROOT}" > ~/.zen/tmp/${MOATS}/${G1PUB}/_chain \ - && echo "${MOATS}" > ~/.zen/tmp/${MOATS}/${G1PUB}/_moats \ - && IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1) && echo "ROOT was ${ZCHAIN}" - ######################################## ################################################################################ ## WRITE INTO 12345 SWARM CACHE LAYER @@ -267,16 +185,6 @@ echo "" > ~/ echo "${EMAIL}:${IPFSROOT}:${MOATS}" >> ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/_visitors/${EMAIL}.log ######################################## -######################################## -echo "PUBLISHING NEW IPFSROOT : ${myIPFS}/ipfs/${IPFSROOT}" - - ( - ipfs name publish --key=${G1PUB} /ipfs/${IPFSROOT} - end=`date +%s` - ipfs key rm ${G1PUB} ## REMOVE UMAP IPNS KEY - echo "(UMAP) IPNS PUBLISH FINISHED at "`expr $end - $start` seconds. - ) & - ## HTTP nc ON PORT RESPONSE echo "$HTTPCORS diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index 3d35efed..de395bc9 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -42,7 +42,7 @@ mkdir -p ~/.zen/tmp/${MOATS}/TW if [[ $SALT != "" && PEPPER != "" ]]; then ASTRO="" - ${MY_PATH}../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/player.key "$SALT" "$PEPPER" 2>/dev/null + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/player.key "$SALT" "$PEPPER" 2>/dev/null ASTRONAUTENS=$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/player.key 2>/dev/null) # echo "/ipns/${ASTRONAUTENS}" @@ -159,7 +159,7 @@ PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7) # echo "Votre clef moa_${PLAYER} <=> $MOANS ($MOAKEYFILE)"; sleep 2 ############################################################ -${MY_PATH}../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.dunikey "$SALT" "$PEPPER" +${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.dunikey "$SALT" "$PEPPER" G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) @@ -195,7 +195,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" mv ~/.zen/tmp/${MOATS}/secret.dunikey ~/.zen/game/players/${PLAYER}/ # Create Player "IPNS Key" (key import) - ${MY_PATH}../tools/keygen -t ipfs -o ~/.zen/game/players/${PLAYER}/secret.player "$SALT" "$PEPPER" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/game/players/${PLAYER}/secret.player "$SALT" "$PEPPER" TWNS=$(ipfs key import ${PLAYER} -f pem-pkcs8-cleartext ~/.zen/game/players/${PLAYER}/secret.player) ASTRONAUTENS=$(ipfs key import $G1PUB -f pem-pkcs8-cleartext ~/.zen/game/players/${PLAYER}/secret.player) @@ -339,7 +339,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" cat ${MY_PATH}/../templates/data/local.gw.json | sed "s~_NID_~${NID}~g" > ~/.zen/tmp/${MOATS}/local.gw.json # Create"${PLAYER}_feed" Key ! DERIVATED ! "$SALT" "$G1PUB" - ${MY_PATH}../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$G1PUB" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$G1PUB" FEEDNS=$(ipfs key import "${PLAYER}_feed" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/feed.ipfskey) ## MAKE LightBeam Plugin Tiddler ${PLAYER}_feed