From 843a32e522881a24ebda1cf68b2109103b222c1f Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 4 Dec 2023 14:05:43 +0100 Subject: [PATCH] EXPLORE IPNS BUTTON APPEARS NOW --- API/ZONE.sh | 14 ++++++++++---- tools/my.sh | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/API/ZONE.sh b/API/ZONE.sh index c3d3ac67..48057dda 100755 --- a/API/ZONE.sh +++ b/API/ZONE.sh @@ -63,11 +63,17 @@ echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}.http sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}.http if [[ $DEG == "0.001" ]]; then - echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "ENTER UPLANET" } ] }' >> ~/.zen/tmp/${MOATS}.http + + 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}" + 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) + + echo '{ "gridNumbers": [ {"lat": '${LAT}', "lon": '${LON}', "number": "UMAP_'${LAT}'_'${LON}'", "ipns": "'${UMAPNS}'" } ] }' >> ~/.zen/tmp/${MOATS}.http cat ~/.zen/tmp/${MOATS}.http | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & rm -Rf ~/.zen/tmp/${MOATS}/ end=`date +%s` - echo "(ZONE $DEG) Operation time was "`expr $end - $start` seconds. + echo "(EXPLORE ZONE $DEG) Operation time was "`expr $end - $start` seconds. exit 0 fi @@ -88,8 +94,8 @@ do [[ $totnum -gt 9 ]] && totnum="X" - [[ $totnum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'" } - ,' >> ~/.zen/tmp/${MOATS}.http && echo "$DEG :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'" }' + [[ $totnum != "0" ]] && echo '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "" } + ,' >> ~/.zen/tmp/${MOATS}.http && echo "$DEG :" '{"lat": '${ZLAT}', "lon": '${ZLON}', "number": "'${totnum}'", "ipns": "" }' done done diff --git a/tools/my.sh b/tools/my.sh index 2c1a9e8c..22a03553 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -467,7 +467,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then ### fi -EARTHCID="/ipfs/QmZCVJVdfvpiy4Qo9mEG9ydCDat2dcXS6T6mVwuWDp8vwc" +EARTHCID="/ipfs/QmcZgAPVt9FiePnSy3zjT8T1kKHrhMAT7GT46Vsi43MACv" FLIPPERCID="${EARTHCID}/coinflip" myUPLANET="${myIPFS}${EARTHCID}" ## EMAIL LAT LON KEY