refresh for best
This commit is contained in:
parent
58994e2aa4
commit
3bdd958828
|
@ -147,36 +147,49 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
## COMMAND A PAYMENT
|
## COMMAND A PAYMENT
|
||||||
if [[ ${WHAT} =~ ^[0-9]+$ ]]; then
|
if [[ ${WHAT} =~ ^[0-9]+$ ]]; then
|
||||||
|
|
||||||
|
## CREATE game pending TX
|
||||||
|
mkdir -p $HOME/.zen/game/pending/${G1PUB}/
|
||||||
|
echo "UNKNOWN" > $HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX
|
||||||
|
######################## ~/.zen/game/pending/*/*_G1WHO+*.TX
|
||||||
|
|
||||||
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'G1CARD:${MOATS}' -m"
|
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'G1CARD:${MOATS}' -m"
|
||||||
${MY_PATH}/../tools/timeout.sh -t 5 \
|
${MY_PATH}/../tools/timeout.sh -t 5 \
|
||||||
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1CARD:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
|
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c "G1CARD:${MOATS}" -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
|
||||||
#################################### SYSTEM IS NOT DUNITER OVER POOL RESISTANT
|
#################################### SYSTEM IS NOT DUNITER OVER POOL RESISTANT
|
||||||
|
|
||||||
if [ $? == 0 ]; then
|
if [ $? == 0 ]; then
|
||||||
|
echo "SENT" > $HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX
|
||||||
|
## Make calculation
|
||||||
|
COINSFILE="$HOME/.zen/tmp/coucou/${G1PUB}.COINS"
|
||||||
|
DESTFILE="$HOME/.zen/tmp/coucou/${VAL}.COINS"
|
||||||
|
|
||||||
## TODO : MEMORIZE TX TO VERIFY ASTRO/DUNITER SYNC
|
CUR=$(cat "${COINSFILE}")
|
||||||
COINSFILE="$HOME/.zen/tmp/${MOATS}/${G1PUB}.COINS"
|
if [[ ! -z "$CUR" && "$CUR" != "null" ]]; then
|
||||||
DESTFILE="$HOME/.zen/tmp/${MOATS}/${VAL}.COINS"
|
RESULT=$(echo "$CUR - $WHAT" | bc)
|
||||||
|
echo "$RESULT" > "${COINSFILE}"
|
||||||
CUR=$(cat ${COINSFILE})
|
else
|
||||||
[[ ${CUR} != "" && ${CUR} != "null" ]] \
|
echo "-${WHAT}" > "${COINSFILE}"
|
||||||
&& echo $((CUR - WHAT)) > ${COINSFILE} \
|
fi
|
||||||
|| echo "-${WHAT}" > ${COINSFILE}
|
cat "${COINSFILE}"
|
||||||
cat ${COINSFILE}
|
|
||||||
|
|
||||||
DES=$(cat ${DESTFILE})
|
DES=$(cat ${DESTFILE})
|
||||||
[[ ${DES} != "" && ${DES} != "null" ]] \
|
[[ ${DES} != "" && ${DES} != "null" ]] \
|
||||||
&& echo $((DES + WHAT)) > ${DESTFILE} \
|
&& echo "$DES + $WHAT" | bc > ${DESTFILE} \
|
||||||
|| echo "${WHAT}" > ${DESTFILE}
|
|| echo "${WHAT}" > ${DESTFILE}
|
||||||
cat ${DESTFILE}
|
cat ${DESTFILE}
|
||||||
## MUST BE DONE BETTER ...
|
|
||||||
## VERIFY AND INFORM OR CONFIRM PAYMENT
|
## VERIFY AND INFORM OR CONFIRM PAYMENT
|
||||||
|
|
||||||
echo "<h1>OPERATION</h1> <h3>${G1PUB} <br> $CUR - ${WHAT}</h3> <h3>${VAL} <br> $DES + ${WHAT} </h3><h2>OK</h2>" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<h1>OPERATION</h1> <h3>${G1PUB} <br> $CUR - ${WHAT}</h3> <h3>${VAL} <br> $DES + ${WHAT} </h3><h2>OK</h2>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
echo "NOK" > $HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX
|
||||||
|
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "<h2>${WHAT} PROBLEM</h2>" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<h2>${WHAT} FORMAT ERROR</h2>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -187,12 +200,12 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ${APPNAME} == "flipper" ]]; then
|
if [[ ${APPNAME} == "flipper" ]]; then
|
||||||
|
## Open OSM2IPF getreceiver App
|
||||||
|
|
||||||
LINK="${myIPFS}/ipfs/QmZdhQVfWe1cEk4Uzuhk7CShSYtXbRWh2yB1hsvuaCdAD5?qrcode=${QRCODE}&pass=${PASS}"
|
LINK="${myIPFS}${GETRECEIVERCID}/?qrcode=${QRCODE}&pass=${PASS}&coins=${CURCOINS}"
|
||||||
## history & read ## CANNOT USE jaklis CLI formated output (JSON output)
|
echo "LINK:$LINK"
|
||||||
sed "s~_TWLINK_~${LINK}~g" ${MY_PATH}/../templates/index.302 > ~/.zen/tmp/${MOATS}/disco
|
echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/disco
|
||||||
sed -i "s~Set-Cookie*~Set-Cookie: $COOKIE~" ~/.zen/tmp/${MOATS}/disco
|
echo "<script>window.location.href = '${LINK}';</script>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
echo "url='"${LINK}"'" >> ~/.zen/tmp/${MOATS}/disco
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -40,13 +40,15 @@ mkdir -p ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu
|
||||||
## PROTOCOL EVOLUTION RUN & REMOVE
|
## PROTOCOL EVOLUTION RUN & REMOVE
|
||||||
rm -Rf ~/.zen/tmp/${IPFSNODEID}/${PLAYER}
|
rm -Rf ~/.zen/tmp/${IPFSNODEID}/${PLAYER}
|
||||||
|
|
||||||
|
|
||||||
###############################
|
###############################
|
||||||
####### NEED G1 TO RUN
|
####### NEED G1 / ZEN TO RUN
|
||||||
[[ ${COINS} == "null" || ${COINS} == "" ]] \
|
[[ ${COINS} == "null" || ${COINS} == "" ]] \
|
||||||
&& echo ">>> ${COINS} : DESACTIVATED - NEED G1 TO REFRESH WISH - EXIT - " \
|
&& echo ">>> ${COINS} : DESACTIVATED - NEED G1 TO REFRESH WISH - EXIT - " \
|
||||||
&& exit 0
|
&& exit 0
|
||||||
echo "%% $COINS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
|
echo "%% ${COINS} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
|
||||||
|
|
||||||
|
[ ${COINS} -lt 2 ] && echo ">>> ${COINS} ONLY : 20 ZEN NEEDED TO CONTINUE" && exit 0
|
||||||
|
|
||||||
###############################
|
###############################
|
||||||
## EXTRACT G1Voeu from PLAYER TW
|
## EXTRACT G1Voeu from PLAYER TW
|
||||||
echo "Exporting ${PLAYER} TW [tag[G1Voeu]]"
|
echo "Exporting ${PLAYER} TW [tag[G1Voeu]]"
|
||||||
|
|
|
@ -121,8 +121,8 @@ a {
|
||||||
<input type='hidden' name='montant' value='0' >
|
<input type='hidden' name='montant' value='0' >
|
||||||
<label for='type'>Type :</label><select name='type'>
|
<label for='type'>Type :</label><select name='type'>
|
||||||
<option value=''>G1BILLET+ ( x 6 )</option>
|
<option value=''>G1BILLET+ ( x 6 )</option>
|
||||||
<option value='jeu' selected>G1Card</option>
|
<option value='jeu' selected>AstroID</option>
|
||||||
<option value='xastro'>G1Card+TW</option>
|
<option value='xastro'>AstroID+TW</option>
|
||||||
</select><input type='hidden' name='dice' value='6' >
|
</select><input type='hidden' name='dice' value='6' >
|
||||||
<button type='submit'>Lancer Fabrication</button>
|
<button type='submit'>Lancer Fabrication</button>
|
||||||
</form>
|
</form>
|
||||||
|
@ -143,14 +143,14 @@ a {
|
||||||
|
|
||||||
<div id="appname">
|
<div id="appname">
|
||||||
<input type="radio" id="r0" name="appname" value="login"> LOGIN
|
<input type="radio" id="r0" name="appname" value="login"> LOGIN
|
||||||
|
<input type="radio" id="r6" name="appname" value="logout"> LOGOUT
|
||||||
<input type="radio" id="r1" name="appname" value="friend"> (★★★★★)
|
<input type="radio" id="r1" name="appname" value="friend"> (★★★★★)
|
||||||
<input type="radio" id="r2" name="appname" value="history"> Historique
|
<input type="radio" id="r2" name="appname" value="history"> Historique
|
||||||
<input type="radio" id="r3" name="appname" value="pay"> Virement
|
<input type="radio" id="r3" name="appname" value="pay"> Virement
|
||||||
<input type="radio" id="r4" name="appname" value="balance" checked="checked"> Balance
|
<input type="radio" id="r4" name="appname" value="balance"> Balance
|
||||||
<input type="radio" id="r5" name="appname" value="flipper"> Zen Coin
|
<input type="radio" id="r5" name="appname" value="flipper" checked="checked"> ZEN
|
||||||
<input type="radio" id="r6" name="appname" value="logout"> LOGOUT
|
|
||||||
</div>
|
</div>
|
||||||
<p><b></b>"G1Card" pperations</p>
|
<p><b></b>"AstroID" operations</p>
|
||||||
|
|
||||||
<strong><div id="resu"></div></strong>
|
<strong><div id="resu"></div></strong>
|
||||||
|
|
||||||
|
@ -212,7 +212,7 @@ a {
|
||||||
var g1pub = document.getElementById("g1pub").value;
|
var g1pub = document.getElementById("g1pub").value;
|
||||||
|
|
||||||
// MEMORIZE
|
// MEMORIZE
|
||||||
if ( appname == 'pay') {
|
if ( appname == 'pay' || appname == 'flipper' ) {
|
||||||
document.getElementById("PASS").value = pass;
|
document.getElementById("PASS").value = pass;
|
||||||
} else {
|
} else {
|
||||||
document.getElementById("PASS").value = "PASS";
|
document.getElementById("PASS").value = "PASS";
|
||||||
|
@ -240,7 +240,7 @@ a {
|
||||||
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + g1pub ;
|
var myU = 'http://astroport.localhost:1234/?qrcode=' + content +'&pass=' + pass + '&' + appname + '=' + amount + '&g1pub=' + g1pub ;
|
||||||
console.log(myU);
|
console.log(myU);
|
||||||
|
|
||||||
if ( appname == 'login') {
|
if ( appname == 'login' || appname == 'flipper' ) {
|
||||||
homeAstroportStation(myU, 'tab', 5000)
|
homeAstroportStation(myU, 'tab', 5000)
|
||||||
} else {
|
} else {
|
||||||
homeAstroportStation(myU, 'aframe', 12000)
|
homeAstroportStation(myU, 'aframe', 12000)
|
||||||
|
|
|
@ -51,12 +51,13 @@ COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
|
||||||
|
|
||||||
# echo "ACTUAL $COINSFILE CONTAINS"
|
# echo "ACTUAL $COINSFILE CONTAINS"
|
||||||
CURCOINS=$(cat $COINSFILE 2>/dev/null)
|
CURCOINS=$(cat $COINSFILE 2>/dev/null)
|
||||||
echo "$CURCOINS G1"
|
echo "$CURCOINS (G1)"
|
||||||
|
|
||||||
## NO or NULL RESULT in CACHE : REFRESHING
|
## NO or NULL RESULT in CACHE : REFRESHING
|
||||||
if [[ $CURCOINS == "" || $CURCOINS == "null" ]]; then
|
if [[ $CURCOINS == "" || $CURCOINS == "null" ]]; then
|
||||||
(
|
(
|
||||||
CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 10 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB} | cut -d '.' -f 1)
|
CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 10 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB})
|
||||||
|
|
||||||
echo "$CURCOINS" > "$COINSFILE"
|
echo "$CURCOINS" > "$COINSFILE"
|
||||||
|
|
||||||
# PREVENT DUNITER DESYNC (KEEPING ASTROPORT LAST KNOWN VALUE)
|
# PREVENT DUNITER DESYNC (KEEPING ASTROPORT LAST KNOWN VALUE)
|
||||||
|
|
|
@ -95,7 +95,7 @@ if [[ ! -d $img_dir ]]; then
|
||||||
|
|
||||||
## WRITE ON IT : ASK FOR REFILL
|
## WRITE ON IT : ASK FOR REFILL
|
||||||
convert -font 'Liberation-Sans' \
|
convert -font 'Liberation-Sans' \
|
||||||
-pointsize 80 -fill purple -draw 'text 50,120 "'"$COINS Ğ1"'"' \
|
-pointsize 80 -fill purple -draw 'text 50,120 "'"$COINS(_) ZEN"'"' \
|
||||||
-pointsize 30 -fill purple -draw 'text 40, 180 "'"$PLAYER"'"' \
|
-pointsize 30 -fill purple -draw 'text 40, 180 "'"$PLAYER"'"' \
|
||||||
-pointsize 14 -fill white -draw 'text 40, 200 "'"${birthdate}"'"' \
|
-pointsize 14 -fill white -draw 'text 40, 200 "'"${birthdate}"'"' \
|
||||||
"${HOME}/.zen/tmp/one.png" "${HOME}/.zen/tmp/carousel/${pub}.png" \
|
"${HOME}/.zen/tmp/one.png" "${HOME}/.zen/tmp/carousel/${pub}.png" \
|
||||||
|
|
|
@ -469,3 +469,7 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then
|
||||||
haut=$((height-200))
|
haut=$((height-200))
|
||||||
###
|
###
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ASTROJSCID="/ipfs/"
|
||||||
|
LOGINCID="/ipfs/"
|
||||||
|
GETRECEIVERCID="/ipfs/QmVCAET43hP37XsSsRmj8P3hEJMXpgcdCAxeQhAyDCKpuE"
|
||||||
|
|
Loading…
Reference in New Issue