diff --git a/12345.sh b/12345.sh index 80294b8a..1ab057e0 100755 --- a/12345.sh +++ b/12345.sh @@ -529,8 +529,10 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh # PAY : /?player=PLAYER&pay=1&dest=G1PUB ############################################## if [[ $APPNAME == "pay" ]]; then - echo "${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro'" - echo "$HTTPCORS $(${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro')" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & + echo "${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro' -m" + echo "$HTTPCORS" > ~/.zen/tmp/pay.log + ${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/pay.log + cat ~/.zen/tmp/pay.log | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & end=`date +%s` echo "(G_G ) PAYING Execution time was "`expr $end - $start` seconds. continue diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 548144df..9147e8f3 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -22,7 +22,7 @@ PLAYERONE="$1" for PLAYER in ${PLAYERONE[@]}; do [[ ! -d ~/.zen/game/players/$PLAYER ]] && echo "BAD $PLAYERONE" && continue MOATS=$(date -u +"%Y%m%d%H%M%S%4N") - [[ $PLAYER == "user" || $PLAYER == "zen" ]] && continue + [[ !$(echo "$PLAYER" | grep '@') ]] && continue mkdir -p ~/.zen/tmp/${MOATS} echo "##################################################################" echo ">>>>> PLAYER : $PLAYER >>>>>>>>>>>>> REFRESHING TW STATION" diff --git a/README.md b/README.md index 6cd5aace..e7c5480e 100644 --- a/README.md +++ b/README.md @@ -91,9 +91,6 @@ Une fois votre Station Astroport démarrée (```~/.start.sh```): ```/?salt=${SALT}&pepper=${PEPPER}&testcraft=json&nodeid=&dataid=$QRHASH``` -* Déclencher un Payement (G1) -```/?salt=${SALT}&pepper=${PEPPER}&pay=$MONTANT&to=$G1PUB``` - Redirections * vers Gchange ```/?salt=${SALT}&pepper=${PEPPER}&g1pub=on``` @@ -101,6 +98,11 @@ Redirections * vers TW ```/?salt=${SALT}&pepper=${PEPPER}&g1pub=astro``` +### PLAYER + +* Déclencher un Payement (G1) +```/?player=${PLAYER}&pay=99&g1pub=DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech``` + ### PUBLIC ### ```/?qrcode=$G1PUB/$IPNS/$...``` diff --git a/tools/jaklis/.env b/tools/jaklis/.env index b69d9ec4..cd7ac784 100644 --- a/tools/jaklis/.env +++ b/tools/jaklis/.env @@ -2,7 +2,7 @@ DUNIKEY=/.zen/game/players/.current/secret.dunikey # Noeud Duniter -NODE=https://duniter.pini.fr/gva +NODE=https://g1.asycn.io/gva # Adresse du pod Cesium ou Gchange à utiliser #POD=https://g1.data.le-sou.org