From 01dc1f88bb32ffcb093f9b6cde7955ed10fcd2a4 Mon Sep 17 00:00:00 2001 From: qo-op Date: Tue, 3 Dec 2019 12:10:09 +0100 Subject: [PATCH] RML14 --- .gitignore | 5 ++++- shell/sms_G1TAG.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cb98b6d..b0f54db 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ g1sms.priv.key shell/init.sh *~ wallets/ - +shell/trash/ +wallets_swarm/ +history.* +TAG/ diff --git a/shell/sms_G1TAG.sh b/shell/sms_G1TAG.sh index 439a0e6..5aa00d8 100755 --- a/shell/sms_G1TAG.sh +++ b/shell/sms_G1TAG.sh @@ -98,7 +98,7 @@ fi ########################################### # PAY VIR + PERCENT G1 ML=$(bc -l <<< "scale=2; $VIR + $PERCENT") -PAY=$(./shell/timeout.sh -t 20 ./silkaj/silkaj transaction --auth-scrypt -salt="$PHONE" -password="$PIN" --amount="$ML" --output="$MASTERPUB" --comment="[G1sms+] ACHAT $3 G1Tag(s) - $2 $UNIT" -y) +PAY=$(./shell/timeout.sh -t 29 ./silkaj/silkaj transaction --auth-scrypt -salt="$PHONE" -password="$PIN" --amount="$ML" --output="$MASTERPUB" --comment="[G1sms+] ACHAT $3 G1Tag(s) - $2 $UNIT" -y) if [[ "$PAY" == "" || "$(echo $PAY | cut -d '|' -f 1)" == "KO" ]]; then new=$(./shell/checknodes.sh "BAN") sms_ERROR "$PHONE" "Il est survenu un problème lors de votre virement: $PAY / Silkaj: $new";