getUMAP_ENV from swarm or self
This commit is contained in:
parent
7df2748b83
commit
48d925fd52
229
API/UPLANET.sh
229
API/UPLANET.sh
|
|
@ -54,71 +54,26 @@ PLAYER=${THAT}
|
|||
|
||||
[[ ${AND} != "zlat" ]] \
|
||||
&& (echo "$HTTPCORS ERROR - BAD PARAMS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
|
||||
|
||||
LAT=${THIS}
|
||||
|
||||
[[ ${LAT} == "0" ]] && LAT="0.00"
|
||||
input_number=${LAT}
|
||||
if [[ ! $input_number =~ ^-?[0-9]{1,3}(\.[0-9]{1,2})?$ ]]; then
|
||||
(echo "$HTTPCORS ERROR - BAD LAT $LAT" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
|
||||
else
|
||||
# If input_number has one decimal digit, add a trailing zero
|
||||
if [[ ${input_number} =~ ^-?[0-9]+\.[0-9]$ ]]; then
|
||||
input_number="${input_number}0"
|
||||
elif [[ ${input_number} =~ ^-?[0-9]+$ ]]; then
|
||||
# If input_number is an integer, add ".00"
|
||||
input_number="${input_number}.00"
|
||||
fi
|
||||
|
||||
# Convert input_number to LAT with two decimal digits
|
||||
LAT="${input_number}"
|
||||
fi
|
||||
|
||||
LON=${WHAT}
|
||||
|
||||
[[ ${APPNAME} != "zlon" ]] \
|
||||
&& (echo "$HTTPCORS ERROR - BAD PARAMS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
|
||||
|
||||
[[ ${LON} == "0" ]] && LON="0.00"
|
||||
input_number=${LON}
|
||||
if [[ ! $input_number =~ ^-?[0-9]{1,3}(\.[0-9]{1,2})?$ ]]; then
|
||||
(echo "$HTTPCORS ERROR - BAD LON $LON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
|
||||
else
|
||||
# If input_number has one decimal digit, add a trailing zero
|
||||
if [[ ${input_number} =~ ^-?[0-9]+\.[0-9]$ ]]; then
|
||||
input_number="${input_number}0"
|
||||
elif [[ ${input_number} =~ ^-?[0-9]+$ ]]; then
|
||||
# If input_number is an integer, add ".00"
|
||||
input_number="${input_number}.00"
|
||||
fi
|
||||
ZLAT=${THIS}
|
||||
ZLON=${WHAT}
|
||||
LAT=$(makecoord ${ZLAT})
|
||||
LON=$(makecoord ${ZLON})
|
||||
|
||||
# Convert input_number to LAT with two decimal digits
|
||||
LON="${input_number}"
|
||||
fi
|
||||
|
||||
# NOT RECEIVING PASS. WAS USED TO SECURE PLAYER UMAP KEY... (24s sectors strategy apply now)
|
||||
#~ PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
|
||||
#~ ## RECEIVED PASS ## CAN BE USED TO SELECT TW TEMPLATE
|
||||
#~ ## RECEIVED VAL ## 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"
|
||||
############################################
|
||||
#### TODO USE THIS PARAMETER TO SELECT TW TEMPLATE
|
||||
|
||||
### CHECK PLAYER EMAIL
|
||||
EMAIL="${PLAYER,,}" # lowercase
|
||||
|
||||
[[ ! ${EMAIL} ]] && (echo "$HTTPCORS ERROR - MISSING ${EMAIL} FOR UPLANET LANDING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && exit 0
|
||||
|
||||
################################ START WORKING WITH KEYS
|
||||
### SESSION "$LAT" "$LON" KEY
|
||||
${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"
|
||||
###
|
||||
|
||||
REDIR="${myIPFS}/ipns/${UMAPNS}"
|
||||
echo "Umap : $REDIR"
|
||||
[[ ! ${EMAIL} ]] \
|
||||
&& (echo "$HTTPCORS ERROR - MISSING ${EMAIL} FOR UPLANET LANDING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
|
||||
&& echo "(☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. \
|
||||
&& exit 0
|
||||
|
||||
## CHECK WHAT IS EMAIL
|
||||
if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||
|
|
@ -126,17 +81,29 @@ if [[ "${EMAIL}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
|||
echo "VALID ${EMAIL} EMAIL OK"
|
||||
|
||||
## CHECK if PLAYER exists in SWARM
|
||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more
|
||||
echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW and more
|
||||
echo "export ASTROPORT=${ASTROPORT} ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${EMAIL} ASTROFEED=${FEEDNS}"
|
||||
|
||||
[[ ${ASTROTW} ]] \
|
||||
&& (echo "$HTTPCORS <meta http-equiv=\"refresh\" content=\"0; url='${ASTROTW}'\" />" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
|
||||
&& exit 0
|
||||
## YES = OPEN TW
|
||||
[[ ${ASTROTW} ]] \
|
||||
&& (echo "$HTTPCORS <meta http-equiv=\"refresh\" content=\"0; url='${ASTROTW}'\" />" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
|
||||
&& exit 0
|
||||
|
||||
else
|
||||
|
||||
echo "BAD EMAIL $EMAIL $LAT $LON"
|
||||
echo "$HTTPCORS <html>BAD EMAIL $EMAIL $LAT $LON <a href=${REDIR}> - OPEN UMAP LINK - </a></html>" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||
|
||||
### GET ENV FOR "$LAT" "$LON"
|
||||
$(${MY_PATH}/../tools/getUMAP_ENV.sh "${LAT}" "${LON}" | tail -n 1)
|
||||
REDIR="${myIPFS}${UMAPIPNS}"
|
||||
echo "Umap : $REDIR"
|
||||
|
||||
if [[ ${UMAPIPNS} != "/ipns/" ]]; then
|
||||
echo "$HTTPCORS <html>BAD EMAIL $EMAIL $LAT $LON <a href=${REDIR}> - OPEN UMAP LINK - </a></html>" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||
else
|
||||
echo "$HTTPCORS <html>BAD EMAIL $EMAIL ($LAT $LON)</html>" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
fi
|
||||
|
|
@ -146,37 +113,19 @@ fi
|
|||
## LAT="$LAT" LON="$LON"
|
||||
######################################################
|
||||
echo "UMAP = $LAT:$LON"
|
||||
echo "# CALCULATING UMAP G1PUB WALLET"
|
||||
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/_cesium.key "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}"
|
||||
G1PUB=$(cat ~/.zen/tmp/${MOATS}/_cesium.key | grep 'pub:' | cut -d ' ' -f 2)
|
||||
[[ ! ${G1PUB} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - KEYGEN COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
|
||||
echo "UMAP G1PUB : ${G1PUB}"
|
||||
|
||||
echo "# CALCULATING UMAP IPNS ADDRESS"
|
||||
mkdir -p ~/.zen/tmp/${MOATS}/${G1PUB}
|
||||
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 "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${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
|
||||
echo "UMAPNS : ${myIPFS}/ipns/${UMAPNS}"
|
||||
echo "# GET UMAP ENV"
|
||||
${MY_PATH}/../tools/getUMAP_ENV.sh "${LAT}" "${LON}"
|
||||
|
||||
## ALL TEST PASSED -> CREATE ZENCARD + ASTROID
|
||||
#~ choose salt pepper with variable words count
|
||||
PPASS=$(${MY_PATH}/../tools/diceware.sh $(( $(./tools/getcoins_from_gratitude_box.sh) + 3 )) | xargs)
|
||||
NPASS=$(${MY_PATH}/../tools/diceware.sh $(( $(./tools/getcoins_from_gratitude_box.sh) + 3 )) | xargs)
|
||||
PPASS=$(${MY_PATH}/../tools/diceware.sh $(( $(${MY_PATH}/../tools/getcoins_from_gratitude_box.sh) + 3 )) | xargs)
|
||||
NPASS=$(${MY_PATH}/../tools/diceware.sh $(( $(${MY_PATH}/../tools/getcoins_from_gratitude_box.sh) + 3 )) | xargs)
|
||||
|
||||
## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT
|
||||
(
|
||||
echo VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}"
|
||||
##### (☉_☉ ) #######
|
||||
${MY_PATH}/../RUNTIME/VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
|
||||
|
||||
## 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
|
||||
echo VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "_URL_" "${LAT}" "${LON}"
|
||||
##### (☉_☉ ) #######
|
||||
${MY_PATH}/../RUNTIME/VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "_URL_" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
|
||||
|
||||
end=`date +%s`
|
||||
echo "(TW REGISTRATION) Operation time was "`expr $end - $start` seconds.
|
||||
|
|
@ -188,61 +137,61 @@ TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${PPASS}" "${NPASS}")
|
|||
|
||||
## HTTP nc ON PORT RESPONSE
|
||||
echo "$HTTPCORS
|
||||
<html>
|
||||
<head>
|
||||
<title>[Astroport] $LAT $LON + ${EMAIL} </title>
|
||||
<meta http-equiv=\"refresh\" content=\"100; url='${myIPFS}/ipns/${TWADD}#AstroID'\" />
|
||||
<style>
|
||||
#countdown { display: flex; justify-content: center; align-items: center; color: #0e2c4c; font-size: 20px; width: 60px; height: 60px; background-color: #e7d9fc; border-radius: 50%;}
|
||||
</style>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
text-align: center;
|
||||
background-color: #f0f0f0;
|
||||
padding: 20px;
|
||||
}
|
||||
h1 {
|
||||
color: #0077cc;
|
||||
}
|
||||
h2 {
|
||||
color: #333;
|
||||
}
|
||||
img {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
</head><body>
|
||||
<h1>UPlanet Registration</h1>
|
||||
${EMAIL} (⌐■_■)<br>
|
||||
<br>Check your mailbox ! Relevez votre boite mail !
|
||||
<hr>
|
||||
<h2><a target=\"_new\" href=\"${myIPFS}/ipns/${TWADD}\">TW5</a></h2>
|
||||
<h1><center><div id='countdown'></div></center></h1>
|
||||
<script>
|
||||
var timeLeft = 90;
|
||||
var elem = document.getElementById('countdown');
|
||||
var timerId = setInterval(countdown, 1000);
|
||||
|
||||
function countdown() {
|
||||
if (timeLeft == -1) {
|
||||
clearTimeout(timerId);
|
||||
doSomething();
|
||||
} else {
|
||||
elem.innerHTML = timeLeft + ' s';
|
||||
timeLeft--;
|
||||
}
|
||||
<html>
|
||||
<head>
|
||||
<title>[Astroport] $LAT $LON + ${EMAIL} </title>
|
||||
<meta http-equiv=\"refresh\" content=\"100; url='${myIPFS}/ipns/${TWADD}#AstroID'\" />
|
||||
<style>
|
||||
#countdown { display: flex; justify-content: center; align-items: center; color: #0e2c4c; font-size: 20px; width: 60px; height: 60px; background-color: #e7d9fc; border-radius: 50%;}
|
||||
</style>
|
||||
<style>
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
text-align: center;
|
||||
background-color: #f0f0f0;
|
||||
padding: 20px;
|
||||
}
|
||||
</script>
|
||||
---
|
||||
<br>( ⚆_⚆) CESIUM MOBILE APP<br>
|
||||
<img src='${myIPFSGW}/ipfs/Qma4dDL7G4c7AQGkwYDg34ew8amppXsHuhyXDMKcTKauuD'\>
|
||||
<br>CONSOLE<br>
|
||||
$(cat ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt 2>/dev/null)
|
||||
<br>(☉_☉ ) use above credentials... utilisez les identiants ci-dessus<br>
|
||||
<br><br>${EMAIL} REGISTERED on UPlanet UMAP : $LAT/$LON : ${MOATS} : $(date)
|
||||
</body>
|
||||
</html>" > ~/.zen/tmp/${MOATS}/http.rep
|
||||
h1 {
|
||||
color: #0077cc;
|
||||
}
|
||||
h2 {
|
||||
color: #333;
|
||||
}
|
||||
img {
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
</head><body>
|
||||
<h1>UPlanet Registration</h1>
|
||||
${EMAIL} (⌐■_■)<br>
|
||||
<br>Check your mailbox ! Relevez votre boite mail !
|
||||
<hr>
|
||||
<h2><a target=\"_new\" href=\"${myIPFS}/ipns/${TWADD}\">TW5</a></h2>
|
||||
<h1><center><div id='countdown'></div></center></h1>
|
||||
<script>
|
||||
var timeLeft = 90;
|
||||
var elem = document.getElementById('countdown');
|
||||
var timerId = setInterval(countdown, 1000);
|
||||
|
||||
function countdown() {
|
||||
if (timeLeft == -1) {
|
||||
clearTimeout(timerId);
|
||||
doSomething();
|
||||
} else {
|
||||
elem.innerHTML = timeLeft + ' s';
|
||||
timeLeft--;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
---
|
||||
<br>( ⚆_⚆) CESIUM MOBILE APP<br>
|
||||
<img src='${myIPFSGW}/ipfs/Qma4dDL7G4c7AQGkwYDg34ew8amppXsHuhyXDMKcTKauuD'\>
|
||||
<br>CONSOLE<br>
|
||||
$(cat ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt 2>/dev/null)
|
||||
<br>(☉_☉ ) use above credentials... utilisez les identiants ci-dessus<br>
|
||||
<br><br>${EMAIL} REGISTERED on UPlanet UMAP($LAT/$LON) : ${MOATS} : $(date)
|
||||
</body>
|
||||
</html>" > ~/.zen/tmp/${MOATS}/http.rep
|
||||
|
||||
(
|
||||
cat ~/.zen/tmp/${MOATS}/http.rep | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
||||
|
|
|
|||
|
|
@ -235,64 +235,28 @@ for PLAYER in ${PLAYERONE[@]}; do
|
|||
|
||||
LAT=$(makecoord ${ZLAT})
|
||||
LON=$(makecoord ${ZLON})
|
||||
SLAT="${LAT::-1}"
|
||||
SLON="${LON::-1}"
|
||||
RLAT="$(echo ${LAT} | cut -d '.' -f 1)"
|
||||
RLON="$(echo ${LON} | cut -d '.' -f 1)"
|
||||
## SEARCH for TODATENS in SWARM then LOCAL
|
||||
## ZEN STATION
|
||||
MYNS=$(cat ~/.zen/tmp/swarm/12D*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/TODATENS)
|
||||
UMAPG1PUB=$(cat ~/.zen/tmp/swarm/12D*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/G1PUB)
|
||||
## BOOSTRAP CASE
|
||||
[[ $MYNS == "" ]] \
|
||||
&& MYNS=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/TODATENS) \
|
||||
&& UMAPG1PUB=$(cat ~/.zen/tmp/${IPFSNODEID}/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/G1PUB)
|
||||
# Search in flashmem
|
||||
if [[ ${MYNS} != "" ]]; then
|
||||
echo "UMAP NEXTNS"
|
||||
UMAPNS=$(cat ~/.zen/tmp/flashmem/${MYNS}/_next.umapns | cut -d ':' -f 3)
|
||||
cat ~/.zen/tmp/flashmem/${MYNS}/_next.umapns
|
||||
echo "SECTOR NEXTNS"
|
||||
SECTORNS=$(cat ~/.zen/tmp/flashmem/${MYNS}/_next.sectorns | cut -d ':' -f 3)
|
||||
cat ~/.zen/tmp/flashmem/${MYNS}/_next.sectorns
|
||||
echo "REGION NEXTNS"
|
||||
REGIONNS=$(cat ~/.zen/tmp/flashmem/${MYNS}/_next.regionns | cut -d ':' -f 3)
|
||||
cat ~/.zen/tmp/flashmem/${MYNS}/_next.regionns
|
||||
fi
|
||||
|
||||
UMAPG1PUB=$(${MY_PATH}/../tools/keygen "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
||||
### GET UMAP ENV
|
||||
$(${MY_PATH}/../tools/getUMAP_ENV.sh "${LAT}" "${LON}" | tail -n 1)
|
||||
echo "UMAPG1PUB=$UMAPG1PUB UMAPIPNS=$UMAPIPNS SECTORG1PUB=$SECTORG1PUB SECTORIPNS=$SECTORIPNS REGIONG1PUB=$REGIONG1PUB REGIONIPNS=$REGIONIPNS LAT=$LAT LON=$LON SLAT=$SLAT SLON=$SLON RLAT=$RLAT RLON=$RLON"
|
||||
|
||||
## CALCULATE UMAP TODATENS ################
|
||||
######################################
|
||||
ipfs key rm "temp" >/dev/null 2>&1
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
|
||||
UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
|
||||
|
||||
echo "UMAP _${LAT}_${LON} UMAPNS=/ipns/${UMAPNS}"
|
||||
|
||||
SECTOR="_${LAT::-1}_${LON::-1}"
|
||||
## CALCULATE SECTOR TODATENS ################
|
||||
ipfs key rm "temp" >/dev/null 2>&1
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
|
||||
TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey)
|
||||
ipfs key rm "temp" >/dev/null 2>&1
|
||||
UMAPNS=$(echo $UMAPIPNS | cut -d '/' -f 3)
|
||||
#############################################
|
||||
# MAKE TODATE "GPS" TIDDLER
|
||||
# MAKE "GPS" TIDDLER
|
||||
cat ${MY_PATH}/../templates/data/GPS.json \
|
||||
| sed -e "s~_MOATS_~${MOATS}~g" \
|
||||
-e "s~_PLAYER_~${PLAYER}~g" \
|
||||
-e "s~_LAT_~${LAT}~g" \
|
||||
-e "s~_LON_~${LON}~g" \
|
||||
-e "s~_UMAPNS_~${UMAPNS}~g" \
|
||||
-e "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" \
|
||||
-e "s~_SECTORTW_~${SECTORIPNS}/TW~g" \
|
||||
> ~/.zen/tmp/${MOATS}/GPS.json
|
||||
|
||||
################# PERSONAL VDO.NINJA ADDRESS)
|
||||
################# PERSONAL VDO.NINJA PHONEBOOTH
|
||||
PHONEBOOTH=${PLAYER/@/_}
|
||||
PHONEBOOTH=${PHONEBOOTH/\./_}
|
||||
PHONEBOOTH=${PHONEBOOTH/-/_}
|
||||
|
||||
# MAKE "ALLO" TIDDLER
|
||||
# MAKE "VISIO" TIDDLER
|
||||
cat ${MY_PATH}/../templates/data/VISIO.json \
|
||||
| sed -e "s~_IPFSNINJA_~${VDONINJA}~g" \
|
||||
-e "s~_MOATS_~${MOATS}~g" \
|
||||
|
|
@ -305,7 +269,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
|||
cp ~/.zen/tmp/${MOATS}/GPS.json ~/.zen/game/players/${PLAYER}/
|
||||
|
||||
#####################################################################
|
||||
# (RE)MAKE "CESIUM" TIDDLER
|
||||
# MAKE "CESIUM" TIDDLER
|
||||
echo "Create CESIUM Tiddler"
|
||||
cat ${MY_PATH}/../templates/data/CESIUM.json \
|
||||
| sed -e "s~_G1PUB_~${G1PUB}~g" \
|
||||
|
|
@ -428,10 +392,10 @@ for PLAYER in ${PLAYERONE[@]}; do
|
|||
-e "s~_MOATS_~${MOATS}~g" \
|
||||
-e "s~_UPLANET_~https://qo-op.com~g" \
|
||||
-e "s~_UPLAYERSTIDS_~${UPLAYERSTIDS_STR}~g" \
|
||||
-e "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" \
|
||||
-e "s~_SECTORTW_~${SECTORIPNS}/TW~g" \
|
||||
> ~/.zen/tmp/${MOATS}/SECTORTW_NEWS.json
|
||||
|
||||
echo "SECTOR $SECTOR SECTORTW=/ipns/${TODATESECTORNS}/TW"
|
||||
echo "SECTOR $SECTOR SECTORTW=${SECTORIPNS}/TW"
|
||||
|
||||
#############################################################
|
||||
# Connect_PLAYER_To_Gchange.sh : Sync FRIENDS TW - TODO : REWRITE
|
||||
|
|
@ -551,7 +515,8 @@ for PLAYER in ${PLAYERONE[@]}; do
|
|||
fi
|
||||
|
||||
## PAY 1 ZEN TO UMAPG1PUB
|
||||
${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "0.1" "${UMAPG1PUB}" "UPLANET:TW:${YOUSER}:/ipfs/${TW}"
|
||||
[[ "${UMAPG1PUB}" != "" ]] \
|
||||
&& ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "0.1" "${UMAPG1PUB}" "UPLANET:TW:${YOUSER}:/ipfs/${TW}"
|
||||
|
||||
else
|
||||
|
||||
|
|
|
|||
|
|
@ -36,23 +36,16 @@ mkdir -p ~/.zen/tmp/${MOATS}
|
|||
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
|
||||
rm ~/.zen/tmp/${MOATS}/GPS.json
|
||||
|
||||
## COULD TRANSERT TO my_swarm G1PUB (IPFSNODEID/MACHINE RELATED KEY)
|
||||
#~ SWARMG1PUB=$(cat ~/.zen/game/myswarm_secret.dunikey | grep "pub:" | cut -d ' ' -f 2)
|
||||
########## SEND COINS TO SECTORG1PUB - ẐEN VIRTUAL BANK - EVERY 800 METERS - ;)
|
||||
LAT=$(makecoord $LAT)
|
||||
LON=$(makecoord $LON)
|
||||
##############################################################
|
||||
# UMAPG1PUB=$(${MY_PATH}/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
||||
##############################################################
|
||||
SLAT="${LAT::-1}"
|
||||
SLON="${LON::-1}"
|
||||
SECTOR="_${SLAT}_${SLON}"
|
||||
##############################################################
|
||||
SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
|
||||
##############################################################
|
||||
## POPULATE UMAP IPNS & G1PUB
|
||||
$($MY_PATH/../tools/getUMAP_ENV.sh ${LAT} ${LON} | tail -n 1)
|
||||
|
||||
COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1)
|
||||
echo "SECTOR WALLET = ${COINS} G1 : ${SECTORG1PUB}"
|
||||
## GET COINS
|
||||
COINS=$($MY_PATH/../tools/COINScheck.sh ${SECTORG1PUB} | tail -n 1)
|
||||
echo "SECTOR WALLET = ${COINS} G1 : ${SECTORG1PUB}"
|
||||
|
||||
## UNPLUG => SEND 10 Zen to SECTORG1PUB
|
||||
## ALL => SEND ALL to $WORLDG1PUB
|
||||
|
|
@ -67,7 +60,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
|
|||
|
||||
## REMOVING PLAYER from ASTROPORT
|
||||
G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub)
|
||||
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
|
||||
ipfs key rm "${PLAYER}" "${PLAYER}_feed" "${G1PUB}"
|
||||
for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* 2>/dev/null | rev | cut -d / -f 1 | rev); do
|
||||
echo "removing wish ${vk}"
|
||||
[[ ${vk} != "" ]] && ipfs key rm ${vk}
|
||||
|
|
|
|||
|
|
@ -310,17 +310,10 @@ if [[ ${wishnumbers} -gt 0 ]]; then
|
|||
LON=$(makecoord $LON)
|
||||
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${TWMAPNS}"
|
||||
rm ~/.zen/tmp/${MOATS}/GPS.json
|
||||
SLAT="${LAT::-1}"
|
||||
SLON="${LON::-1}"
|
||||
SECTOR="_${SLAT}_${SLON}"
|
||||
RLAT="$(echo ${LAT} | cut -d '.' -f 1)"
|
||||
RLON="$(echo ${LON} | cut -d '.' -f 1)"
|
||||
REGION="_${RLAT}_${RLON}"
|
||||
##############################################################
|
||||
UMAPG1PUB=$(cat ~/.zen/tmp/swarm/12D*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/G1PUB | tail -n 1)
|
||||
SECTORG1PUB=$(cat ~/.zen/tmp/swarm/12D*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}_${SLON}/_${LAT}_${LON}/SECTORG1PUB | tail -n 1)
|
||||
[[ ${UMAPG1PUB} == "" ]] && UMAPG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${LAT}" "${UPLANETNAME}${LON}")
|
||||
[[ ${SECTORG1PUB} == "" ]] && SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${UPLANETNAME}${SECTOR}" "${UPLANETNAME}${SECTOR}")
|
||||
|
||||
## GET UMAP ENV
|
||||
$(${MY_PATH}/../tools/getUMAP_ENV.sh ${LAT} ${LON} | tail -n 1)
|
||||
|
||||
##############################################################
|
||||
GRATITUDE=$($MY_PATH/../tools/getcoins_from_gratitude_box.sh)
|
||||
G1AMOUNT=$(echo "$GRATITUDE / 10" | bc -l | xargs printf "%.2f" | sed "s~,~.~g" )
|
||||
|
|
|
|||
|
|
@ -20,8 +20,10 @@ ZLON=$(makecoord ${LON})
|
|||
## COMPUTE UMAP, USECTOR, UREGION
|
||||
SLAT="${LAT::-1}"
|
||||
SLON="${LON::-1}"
|
||||
SECTOR="_${SLAT}_${SLON}"
|
||||
RLAT="$(echo ${LAT} | cut -d '.' -f 1)"
|
||||
RLON="$(echo ${LON} | cut -d '.' -f 1)"
|
||||
REGION="_${RLAT}_${RLON}"
|
||||
|
||||
## GET ENV
|
||||
echo "UMAP : _${LAT}_${LON}"
|
||||
|
|
@ -50,6 +52,6 @@ REGIONIPNS="/ipns/"$(cat ~/.zen/tmp/swarm/*/UPLANET/__/_${RLAT}_${RLON}/_${SLAT}
|
|||
echo "REGIONIPNS=$REGIONIPNS"
|
||||
|
||||
echo "## LAST LINE EXPORT"
|
||||
echo "export UMAPG1PUB=$UMAPG1PUB UMAPIPNS=$UMAPIPNS SECTORG1PUB=$SECTORG1PUB SECTORIPNS=$SECTORIPNS REGIONG1PUB=$REGIONG1PUB REGIONIPNS=$REGIONIPNS"
|
||||
echo "export UMAPG1PUB=$UMAPG1PUB UMAPIPNS=$UMAPIPNS SECTOR=$SECTOR SECTORG1PUB=$SECTORG1PUB SECTORIPNS=$SECTORIPNS REGION=$REGION REGIONG1PUB=$REGIONG1PUB REGIONIPNS=$REGIONIPNS LAT=$LAT LON=$LON SLAT=$SLAT SLON=$SLON RLAT=$RLAT RLON=$RLON"
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue