work efficiently 90% of the time
This commit is contained in:
parent
0cf83a5d51
commit
9b8c51de5d
151
API/QRCODE.sh
151
API/QRCODE.sh
|
|
@ -36,14 +36,14 @@ mkdir -p ~/.zen/tmp/${MOATS}/
|
|||
###############################################################################
|
||||
if [[ ${QRCODE} == "station" ]]; then
|
||||
|
||||
# rm ~/.zen/tmp/ISTATION ## REMOVE IN PROD
|
||||
rm ~/.zen/tmp/ISTATION ## REMOVE IN PROD
|
||||
|
||||
if [[ ! -s ~/.zen/tmp/ISTATION ]]; then
|
||||
## GENERATE PLAYER G1 TO ZEN ACCOUNTING
|
||||
ISTATION=$($MY_PATH/../tools/make_image_ipfs_index_carousel.sh | tail -n 1)
|
||||
echo $ISTATION > ~/.zen/ISTATION ## STATION G1WALLET CAROUSEL
|
||||
echo $ISTATION > ~/.zen/tmp/ISTATION ## STATION G1WALLET CAROUSEL
|
||||
else
|
||||
ISTATION=$(cat ~/.zen/ISTATION)
|
||||
ISTATION=$(cat ~/.zen/tmp/ISTATION)
|
||||
fi
|
||||
## SHOW G1PALPAY FRONT (IFRAME)
|
||||
sed "s~_STATION_~${myIPFS}${ISTATION}/~g" $MY_PATH/../www/G1PalPay/index.html > ~/.zen/tmp/${MOATS}/index.htm
|
||||
|
|
@ -55,7 +55,7 @@ if [[ ${QRCODE} == "station" ]]; then
|
|||
end=`date +%s`
|
||||
echo "NEW WSTATION ${myIPFS}${WSTATION} Execution time was "`expr $end - $start` seconds.
|
||||
## SEND TO WSTATION PAGE
|
||||
sed "s~_TWLINK_~${myIPFS}${WSTATION}/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed "s~_TWLINK_~${myIPFS}${WSTATION}/~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${myIPFS}${WSTATION}"'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
(
|
||||
|
|
@ -69,7 +69,7 @@ fi
|
|||
## MODE PGP ENCRYPTED QRCODE
|
||||
# http://127.0.0.1:1234/?qrcode=-----BEGIN%20PGP%20MESSAGE-----~~jA0ECQMC5iqIY7XLnGn_0koBJB5S2Sy1p%2FHr8CKFgWdZ9_j%2Fb2qdOznICGvqGCXY~7Flw6YtiabngvY6biq%2F0vpiFL8t8BSbMZe0GLBU90EMBrhzEiyPnh__bzQ%3D%3D~%3D9UIj~-----END%20PGP%20MESSAGE-----~&pass=coucou&pay=1&g1pub=
|
||||
################################################################################
|
||||
if [[ ${QRCODE:0:5} == "-----" ]]; then
|
||||
if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||
echo ${QRCODE}
|
||||
PASS=$(urldecode $THIS)
|
||||
echo "## THIS IS A PGP ENCRYPTED QRCODE LOOK - PASS $PASS - $APPNAME"
|
||||
|
|
@ -80,13 +80,10 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
|
|||
sed -i '$ d' ~/.zen/tmp/${MOATS}/disco.aes
|
||||
|
||||
echo "cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "$PASS" --batch"
|
||||
|
||||
cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "$PASS" --batch > ~/.zen/tmp/${MOATS}/disco
|
||||
|
||||
cat ~/.zen/tmp/${MOATS}/disco
|
||||
|
||||
DISCO=$(cat ~/.zen/tmp/${MOATS}/disco | cut -d '?' -f2)
|
||||
# cat ~/.zen/tmp/${MOATS}/disco
|
||||
## FORMAT SHOULD BE "/?salt=${USALT}&pepper=${UPEPPER}"
|
||||
DISCO=$(cat ~/.zen/tmp/${MOATS}/disco | cut -d '?' -f2)
|
||||
arr=(${DISCO//[=&]/ })
|
||||
salt=$(urldecode ${arr[1]} | xargs)
|
||||
pepper=$(urldecode ${arr[3]} | xargs)
|
||||
|
|
@ -97,7 +94,7 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
|
|||
G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.key | grep 'pub:' | cut -d ' ' -f 2)
|
||||
|
||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${G1PUB}"
|
||||
~/.zen/Astroport.ONE/tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin
|
||||
${MY_PATH}/../tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin
|
||||
cat ~/.zen/tmp/${G1PUB}.curcoin
|
||||
CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1)
|
||||
echo "CURRENT KEY : $CURCOINS G1"
|
||||
|
|
@ -110,10 +107,19 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
|
|||
if [[ $APPNAME == "pay" ]]; then
|
||||
if [[ $WHAT =~ ^[0-9]+$ ]]; then
|
||||
|
||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m"
|
||||
~/.zen/Astroport.ONE/tools/timeout.sh -t 3 \
|
||||
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
|
||||
|
||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m"
|
||||
${MY_PATH}/../tools/timeout.sh -t 3 \
|
||||
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'ASTRO:Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
|
||||
####################################
|
||||
if [ $? == 0 ]; then
|
||||
echo "ADJUSTING LOCAL CACHE ACOUNTING"
|
||||
COINSFILE=$HOME/.zen/tmp/coucou/${VAL}.COINS
|
||||
CUR=$(cat ${COINFILE})
|
||||
[[ ${CUR} != "" && ${CUR} != "null" ]] \
|
||||
&& echo $((CUR+WHAT)) > ${COINFILE} \
|
||||
|| echo ${WHAT} > ${COINFILE}
|
||||
cat ${COINFILE}
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
|
@ -170,7 +176,7 @@ if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then
|
|||
## REDIRECT TO G1VOEU IPNS ADDRESS
|
||||
[[ $LINK == "" ]] && LINK="$myIPFS/ipfs/QmWUZr62SpriLPuqauMbMxvw971qnu741hV8EhrHmKF2Y4" ## 404 LOST IN CYBERSPACE
|
||||
echo "#>>> DISPLAY WISHNS >>>> # $VOEU : $LINK"
|
||||
sed "s~_TWLINK_~${LINK}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed "s~_TWLINK_~${LINK}~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
(
|
||||
|
|
@ -195,7 +201,7 @@ if [[ $ASTROPATH != "" && $APPNAME == "" ]]; then
|
|||
#### SELECT PARRAIN "G1PalPay"
|
||||
|
||||
echo "#>>>>>>>>>>>> # REDIRECT TO CREATE G1BILLETS"
|
||||
sed "s~_TWLINK_~${myG1BILLET}?montant=0\&style=$PLAYER~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed "s~_TWLINK_~${myG1BILLET}?montant=0\&style=$PLAYER~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${myG1BILLET}"?montant=0\&style=$PLAYER'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
(
|
||||
|
|
@ -208,19 +214,19 @@ else
|
|||
|
||||
echo "NOT ON BOARD"
|
||||
echo "What is this $QRCODE ?"
|
||||
echo "AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9"
|
||||
echo "AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 COOKIE=$10"
|
||||
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
## FILTRAGE NON G1 TO IPFS READY QRCODE
|
||||
ASTROTOIPFS=$(~/.zen/Astroport.ONE/tools/g1_to_ipfs.py ${QRCODE} 2>/dev/null)
|
||||
ASTROTOIPFS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${QRCODE} 2>/dev/null)
|
||||
[[ ! ${ASTROTOIPFS} ]] \
|
||||
&& echo "INVALID QRCODE : ${QRCODE}" \
|
||||
&& (echo "$HTTPCORS ERROR - INVALID QRCODE : ${QRCODE}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
|
||||
&& exit 1
|
||||
################################################################################
|
||||
|
||||
echo "############################################################################"
|
||||
echo ">>> ${QRCODE} g1_to_ipfs $ASTROTOIPFS"
|
||||
###########################################""
|
||||
###########################################
|
||||
|
|
@ -228,7 +234,7 @@ echo ">>> ${QRCODE} g1_to_ipfs $ASTROTOIPFS"
|
|||
###########################################""
|
||||
MYPLAYERKEY=$(grep ${QRCODE} ~/.zen/game/players/*/secret.dunikey | cut -d ':' -f 1)
|
||||
[[ $MYPLAYERKEY == "" ]] && MYPLAYERKEY="$HOME/.zen/game/players/.current/secret.dunikey"
|
||||
echo "SELECTED KEY : $(cat $MYPLAYERKEY)"
|
||||
echo "SELECTED STATION KEY : $(cat $MYPLAYERKEY | grep 'pub:')"
|
||||
echo
|
||||
|
||||
## PARRAIN ID EXTRACTION
|
||||
|
|
@ -236,18 +242,17 @@ echo
|
|||
CURPLAYER=$(cat ~/.zen/game/players/.current/.player)
|
||||
CURG1=$(cat ~/.zen/game/players/.current/.g1pub)
|
||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${CURG1}"
|
||||
~/.zen/Astroport.ONE/tools/COINScheck.sh ${CURG1} > ~/.zen/tmp/curcoin
|
||||
cat ~/.zen/tmp/curcoin
|
||||
CURCOINS=$(cat ~/.zen/tmp/curcoin | tail -n 1)
|
||||
time ${MY_PATH}/../tools/COINScheck.sh ${CURG1} > ~/.zen/tmp/${MOATS}/curcoin
|
||||
CURCOINS=$(cat ~/.zen/tmp/${MOATS}/curcoin | tail -n 1)
|
||||
echo "CURRENT PLAYER : $CURCOINS G1"
|
||||
|
||||
## WALLET JAMAIS SERVI
|
||||
###########################################
|
||||
if [[ $CURCOINS == "null" ]]; then
|
||||
echo "NULL. PLEASE CHARGE. REDIRECT TO WSTATION HOME"
|
||||
sed "s~_TWLINK_~$(cat ~/.zen/WSTATION)~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed "s~_TWLINK_~$(cat ~/.zen/tmp/WSTATION)~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${myIPFSGW}$(cat ~/.zen/WSTATION)"'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${myIPFSGW}$(cat ~/.zen/tmp/WSTATION)"'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
(
|
||||
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
||||
echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
|
||||
|
|
@ -259,16 +264,22 @@ fi
|
|||
###########################################
|
||||
if [[ ${CURG1} == ${QRCODE} ]]; then
|
||||
|
||||
echo "SAME PLAYER AS CURRENT"
|
||||
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "$CURPLAYER WALLET : $CURCOINS G1" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
(
|
||||
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
||||
echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
|
||||
) &
|
||||
exit 0
|
||||
|
||||
else
|
||||
# PAS MOA
|
||||
# ANY VISITOR WALLET
|
||||
###########################################
|
||||
## GET VISITOR G1 WANNET AMOUNT : VISITORCOINS
|
||||
## GET VISITOR G1 WALLET AMOUNT : VISITORCOINS
|
||||
echo "COINScheck : ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${QRCODE}"
|
||||
VISITORCOINS=$(~/.zen/Astroport.ONE/tools/COINScheck.sh ${QRCODE} | tail -n 1)
|
||||
VISITORCOINS=$(${MY_PATH}/../tools/COINScheck.sh ${QRCODE} | tail -n 1)
|
||||
|
||||
## PALPE COMBIEN ?
|
||||
## EMPTY WALLET ? PREPARE PALPE WELCOME
|
||||
if [[ $VISITORCOINS == "" || $VISITORCOINS == "null" ]]; then
|
||||
# REGLER "DUREE DE VIE" : PALPE / WISH_NB / DAY
|
||||
PALPE=10
|
||||
|
|
@ -280,57 +291,69 @@ else
|
|||
|
||||
## GET G1 WALLET HISTORY
|
||||
[[ ! -s ~/.zen/tmp/coucou/${QRCODE}.g1history.json ]] \
|
||||
&& ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/coucou/${QRCODE}.g1history.json &
|
||||
&& ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/coucou/${QRCODE}.g1history.json &
|
||||
|
||||
## SCAN GCHANGE +
|
||||
[[ ! -s ~/.zen/tmp/coucou/${QRCODE}.gchange.json ]] \
|
||||
&& ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gchange.json &
|
||||
&& ${MY_PATH}/../tools/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gchange.json &
|
||||
|
||||
GFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '.found')
|
||||
echo "GFOUND=$GFOUND"
|
||||
[[ $GFOUND == "false" ]] \
|
||||
&& echo "NO GCHANGE YET. REDIRECT" \
|
||||
&& sed "s~_TWLINK_~${myGCHANGE}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& echo "url='"${myGCHANGE}"'" >> ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) &
|
||||
echo "FOUND IN GCHANGE+ ? $GFOUND"
|
||||
|
||||
if [[ $GFOUND == "false" ]]; then
|
||||
echo "NO GCHANGE YET. REDIRECT"
|
||||
sed "s~_TWLINK_~${myGCHANGE}~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${myGCHANGE}"'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) &
|
||||
exit 0
|
||||
else
|
||||
echo "~/.zen/tmp/coucou/${QRCODE}.gchange.json CHECK"
|
||||
fi
|
||||
|
||||
## SCAN CESIUM +
|
||||
[[ ! -s ~/.zen/tmp/coucou/${QRCODE}.gplus.json ]] \
|
||||
&& ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gplus.json 2>/dev/null &
|
||||
&& ${MY_PATH}/../tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${QRCODE} > ~/.zen/tmp/coucou/${QRCODE}.gplus.json 2>/dev/null &
|
||||
|
||||
GCFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.gplus.json | jq -r '.found')
|
||||
echo "GCFOUND=$GCFOUND"
|
||||
[[ $GCFOUND == "false" ]] \
|
||||
&& echo "AUCUN GCPLUS : PAS DE CESIUM POUR CLEF GCHANGE" \
|
||||
&& sed "s~_TWLINK_~https://demo.cesium.app/#/app/wot/$QRCODE/~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& echo "url='"${myASTRONEF}"'" >> ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) &
|
||||
echo "FOUND IN CESIUM+ ? $GCFOUND"
|
||||
|
||||
if [[ $GCFOUND == "false" ]]; then
|
||||
echo "PAS DE COMPTE CESIUM POUR CETTE CLEF GCHANGE"
|
||||
sed "s~_TWLINK_~https://demo.cesium.app/#/app/wot/$QRCODE/~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
echo "url='"${myASTRONEF}"'" >> ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) &
|
||||
exit 0
|
||||
else
|
||||
echo "~/.zen/tmp/coucou/${QRCODE}.gplus.json CHECK"
|
||||
fi
|
||||
|
||||
## CHECK IF GCHANGE IS LINKED TO "A DECLARED CESIUM"
|
||||
CPUB=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '._source.pubkey' 2>/dev/null)
|
||||
echo "CPUB=$CPUB"
|
||||
CPLUS=$(cat ~/.zen/tmp/coucou/${QRCODE}.gchange.json | jq -r '._source.pubkey' 2>/dev/null)
|
||||
echo "CPLUS=$CPLUS"
|
||||
## SCAN GPUB CESIUM +
|
||||
|
||||
##### DO WE HAVE A MEMBER LINKED ??
|
||||
if [[ $CPUB && $CPUB != 'null' && $CPUB != $QRCODE ]]; then
|
||||
##### DO WE HAVE A DIFFERENT KEY LINKED TO GCHANGE ??
|
||||
if [[ $CPLUS != "" && $CPLUS != 'null' && $CPLUS != $QRCODE ]]; then
|
||||
|
||||
## SCAN CPUB CESIUM +
|
||||
## SCAN FOR CPLUS CESIUM + ACCOUNT
|
||||
[[ ! -s ~/.zen/tmp/coucou/${QRCODE}.cplus.json ]] \
|
||||
&& ~/.zen/Astroport.ONE/tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPUB} > ~/.zen/tmp/coucou/${QRCODE}.cplus.json 2>/dev/null &
|
||||
&& ${MY_PATH}/../tools/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPLUS} > ~/.zen/tmp/coucou/${QRCODE}.cplus.json 2>/dev/null &
|
||||
|
||||
CCFOUND=$(cat ~/.zen/tmp/coucou/${QRCODE}.cplus.json | jq -r '.found')
|
||||
|
||||
[[ $CCFOUND == "false" ]] \
|
||||
&& echo "AUCUN CCPLUS : MEMBRE LIE" \
|
||||
&& sed "s~_TWLINK_~https://monnaie-libre.fr~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect \
|
||||
&& ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) &
|
||||
|
||||
## MESSAGE LINKED CESIUM WALLET
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${CPUB}" -t "COUCOU" \
|
||||
-m "VOUS AVEZ ${VISITORCOINS} G1 SUR VOTRE COMPTE ${QRCODE}"
|
||||
if [[ $CCFOUND == "false" ]]; then
|
||||
echo "AUCUN CCPLUS : MEMBRE LIE"
|
||||
sed "s~_TWLINK_~https://monnaie-libre.fr~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/index.redirect
|
||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/index.redirect
|
||||
( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1) &
|
||||
exit 0
|
||||
else
|
||||
## MESSAGE TO LINKED CESIUM WALLET
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${CPLUS}" -t "COUCOU" \
|
||||
-m "VOTRE PORTEFEUILLE ${QRCODE} A ETE SCANNE PAR $myASTROPORT - IL CONTIENT ${VISITORCOINS} G1 -"
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
|
|
@ -357,7 +380,7 @@ else
|
|||
## SEND ONE ★ (NEXT STEP GCHANGE)
|
||||
my_star_level=1
|
||||
echo "★ SENDING $my_star_level STAR(s) ★"
|
||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey stars -p ${QRCODE} -n $my_star_level
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/.current/secret.dunikey stars -p ${QRCODE} -n $my_star_level
|
||||
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
# astroport.cancer.copylaradio.com
|
||||
/ip4/185.202.238.69/tcp/4001/p2p/12D3KooWDYpPdfCFf3CbKpcLNmyA2vmJs4JY55k8yje9R1MxSgdB
|
||||
|
||||
# rock64.copylaradio.com
|
||||
/dnsaddr/rock64.copylaradio.com/p2p/12D3KooWSQYTxeoZZ39SNosEKxi7RUdGTtAQAqpKeZJxjzqqrZTx
|
||||
# scorpio.copylaradio.com
|
||||
/dnsaddr/scorpio.copylaradio.com/p2p/12D3KooWS8EiLNay8qVnFaULpxW1X9sGZZz4wV8E6E3QEwCRktry
|
||||
|
||||
# astroport.sonic.copylaradio.com
|
||||
/ip4/161.97.174.60/tcp/4001/p2p/12D3KooWJki74EkJ8YUhrAfr2UwtQiJKBY94PYLmVnEQe9jo3aqC
|
||||
|
|
|
|||
|
|
@ -40,12 +40,12 @@ ASTROPATH=$(grep $G1PUB ~/.zen/game/players/*/.g1pub | cut -d ':' -f 1 | rev | c
|
|||
echo $ASTROPATH
|
||||
|
||||
if [[ -d $ASTROPATH ]]; then
|
||||
COINSFILE=$ASTROPATH/ipfs/G1SSB/COINS
|
||||
else
|
||||
mkdir -p $HOME/.zen/tmp/coucou/
|
||||
COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
|
||||
INNERFILE=$ASTROPATH/ipfs/G1SSB/COINS
|
||||
fi
|
||||
|
||||
mkdir -p $HOME/.zen/tmp/coucou/
|
||||
COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
|
||||
|
||||
echo "ACTUAL $COINSFILE CONTAINS"
|
||||
CURCOINS=$(cat $COINSFILE 2>/dev/null)
|
||||
echo "$CURCOINS G1"
|
||||
|
|
@ -55,6 +55,7 @@ if [[ $CURCOINS == "" || $CURCOINS == "null" ]]; then
|
|||
(
|
||||
CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 180 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB} | cut -d '.' -f 1)
|
||||
echo "$CURCOINS" > "$COINSFILE"
|
||||
[[ $INNERFILE != "" ]] && echo "$CURCOINS" > "$INNERFILE"
|
||||
echo $CURCOINS
|
||||
) &
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ a {
|
|||
|
||||
<div id="demo">
|
||||
<div id="description">
|
||||
<h1><a href="javascript:history.go(-1)">(Ğ1) <span>♥Box</span> Station</a></h1><br>
|
||||
<h1><a href="http://astroport.localhost:1234">(Ğ1) <span>♥Box</span> Station</a></h1><br>
|
||||
<h2>Oubliez la crise... N'attendez pas la Retraite !</h2>
|
||||
<h2>Essayez la Monnaie Libre.<br>Explorez le Monde Librement.</h2>
|
||||
</div>
|
||||
|
|
@ -114,6 +114,12 @@ a {
|
|||
|
||||
<video id="preview" style="transform: scaleX(-1);width: 240px;height: 240px;" autoplay="autoplay" class="active"></video>
|
||||
<strong><div id="countdown"></div></strong>
|
||||
<div id="appname">
|
||||
<input type="radio" id="r1" name="appname" value="messaging"> Messagerie
|
||||
<input type="radio" id="r2" name="appname" value="history"> Historique
|
||||
<input type="radio" id="r3" name="appname" value="pay" checked="checked"> Payer
|
||||
</div>
|
||||
|
||||
<strong><div id="resu"></div></strong>
|
||||
<p> <strong>Scannez QRCode</strong> </p>
|
||||
<p><a target="g1billet" href="https://g1sms.fr/fr/g1billet">G1BILLET</a> </p>
|
||||
|
|
@ -159,15 +165,22 @@ a {
|
|||
scanner.addListener('scan', function (content) {
|
||||
alert(content);
|
||||
if (content.startsWith('~~~~~')) {
|
||||
// Try to decode PGP
|
||||
// GET PASS THAT DECODE PGP
|
||||
var pass = prompt("Saisir PASS:");
|
||||
// GET APPNAME
|
||||
var appname = document.querySelector('input[name="appname"]:checked').value;
|
||||
// DEFAULT PAY
|
||||
if ( appname == 'pay') {
|
||||
var amount = prompt("Saisir MONTANT Ğ1:");
|
||||
}
|
||||
// DESTINATION WAS PREVIOUS SCAN
|
||||
if (document.getElementById("resu").innerHTML !== '') {
|
||||
var mypub = document.getElementById("resu").innerHTML.value;
|
||||
} else {
|
||||
// OR IF NONE Fred ;)
|
||||
var mypub = "DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech"
|
||||
}
|
||||
var pass = prompt("Saisir PASS:");
|
||||
var amount = prompt("Saisir MONTANT Ğ1:");
|
||||
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&pay=' + amount + '&g1pub=' + mypub ;
|
||||
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + mypub ;
|
||||
} else {
|
||||
document.getElementById("resu").innerHTML = content;
|
||||
var myU = 'http://astroport.localhost:1234/?qrcode=' + content;
|
||||
|
|
|
|||
Loading…
Reference in New Issue