diff --git a/API/SALT.sh b/API/SALT.sh index f1079db3..6738f060 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -345,27 +345,27 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh if [[ $WHAT =~ ^[0-9]+$ ]]; then - echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${WHAT} -p ${VAL} -c 'Bro' -m" - ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \ - ${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/$PLAYER.pay.$WHAT.http + echo "${MY_PATH}/../tools/PAY4SURE.sh ~/.zen/tmp/${MOATS}/${MOATS}.secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro'" + ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/tmp/${MOATS}/${MOATS}.secret.key" "${WHAT}" "${VAL}" "Bro" + echo "PAY4SURE " >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http fi if [[ "$WHAT" == "history" ]]; then sed -i "s~text/html~application/json~g" ~/.zen/tmp/$PLAYER.pay.$WHAT.http ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey history -j >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/${MOATS}.secret.key history -j >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http fi if [[ "$WHAT" == "get" ]]; then sed -i "s~text/html~application/json~g" ~/.zen/tmp/$PLAYER.pay.$WHAT.http ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey get >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/${MOATS}.secret.key get >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http fi if [[ "$WHAT" == "balance" ]]; then ~/.zen/Astroport.ONE/tools/timeout.sh -t 20 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey balance >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http + ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/${MOATS}.secret.key balance >> ~/.zen/tmp/$PLAYER.pay.$WHAT.http fi cat ~/.zen/tmp/$PLAYER.pay.$WHAT.http diff --git a/README.md b/README.md index 7c161723..4d4ebd99 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Introduction +[Astroport DEV Journal](https://pad.p2p.legal/s/AstroportDEVJournal#) + **Embark on a Cosmic Journey with ZenCard Payment System and Astroport.ONE** Are you weary of the constraints of traditional payment systems and concerned about the reliability diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh index 883f4505..def70485 100755 --- a/RUNTIME/G1PalPay.sh +++ b/RUNTIME/G1PalPay.sh @@ -161,8 +161,7 @@ while read LINE; do if [[ ${ASTROG1} != ${G1PUB} ]]; then - ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ - ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${SHARE} -p ${ASTROG1} -c "G1PalPay:$N:$IPUBKEY" -m > /dev/null 2>&1 + ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${SHARE}" "${ASTROG1}" "G1PalPay:$N:$IPUBKEY" STAMP=$? else @@ -237,7 +236,7 @@ while read LINE; do ## SEND zen ZEN (G1 dice JUNE) TO ALL ## MAKE ONE EACH AFTER ALL EMAIL CONSUMED ## #~ ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 \ - #~ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${zen} -p ${ASTROG1} -c "${emails[@]} $TTITLE" -m > /dev/null 2>&1 + #~ ${MY_PATH}/../tools/PAY4SURE.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey pay -a ${zen} -p ${ASTROG1} -c "${emails[@]} $TTITLE" -m > /dev/null 2>&1 ## Filling comment with email list will make players resend to all ## MAY BE A BAD IDEA ### ${MY_PATH}/../tools/PAY4SURE.sh "${HOME}/.zen/game/players/${PLAYER}/secret.dunikey" "${zen}" "${ASTROG1}" "${emails[@]} $TTITLE"