From 48df6ceb7a5896d3b930620a7b475fb9bd1c169c Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Wed, 24 Apr 2024 14:45:25 +0200
Subject: [PATCH] switch gva server on ERROR

---
 tools/COINScheck.sh               | 15 ++++++++++++---
 tools/GetGCAttributesFromG1PUB.sh | 16 ++++++++++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/tools/COINScheck.sh b/tools/COINScheck.sh
index d5948528..703ed688 100755
--- a/tools/COINScheck.sh
+++ b/tools/COINScheck.sh
@@ -50,7 +50,7 @@ mkdir -p $HOME/.zen/tmp/coucou/
 COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
 #######################################################
 ## GET EXTERNAL G1 DATA
-${MY_PATH}/GetGCAttributesFromG1PUB.sh ${G1PUB}
+${MY_PATH}/../tools/GetGCAttributesFromG1PUB.sh ${G1PUB}
 #######################################################
 #######################################################
 
@@ -62,8 +62,17 @@ echo "SOLDE : $CURCOINS G1"
 if [[ $CURCOINS == "" || $CURCOINS == "null" ]]; then
     (
     CURCOINS=$(${MY_PATH}/timeout.sh -t 10 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB})
-    [[ "$CURCOIN" == "" ]] && echo "JAKLIS ERROR"
-    [[ "$CURCOIN" == "null" ]] && echo "EMPTY WALLET"
+    if [[ "$CURCOINS" == "" ]]; then
+        echo "JAKLIS ERROR"
+        GVASERVER=$(${MY_PATH}/../tools/duniter_getnode.sh | tail -n 1)
+        ## Changing GVA SERVER in tools/jaklis/.env
+        [[ $(echo ${GVASERVER} | grep "/gva" ) ]] \
+            && cat ${MY_PATH}/../tools/jaklis/.env.template > tools/jaklis/.env \
+            && echo "NODE=${GVASERVER}" >> ${MY_PATH}/../tools/jaklis/.env \
+            && echo "OK. NEW GVA NODE : ${GVASERVER}" \
+            || echo "ERROR. BAD GVA NODE : ${GVASERVER}"
+    fi
+    [[ "$CURCOINS" == "null" ]] && echo "EMPTY WALLET"
 
     echo "$CURCOINS" > "$COINSFILE"
 
diff --git a/tools/GetGCAttributesFromG1PUB.sh b/tools/GetGCAttributesFromG1PUB.sh
index ae8e7956..78f4c82e 100755
--- a/tools/GetGCAttributesFromG1PUB.sh
+++ b/tools/GetGCAttributesFromG1PUB.sh
@@ -7,6 +7,8 @@
 ################################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"${MY_PATH}\" && pwd )`"  # absolutized and normalized
+ME="${0##*/}"
+
 . "${MY_PATH}/my.sh"
 
 [[ ${1} == "-h" || ${1} == "--help" ]] && echo "#################################################
@@ -26,15 +28,25 @@ mkdir -p ~/.zen/tmp/${MOATS}
 COINS=$(cat ~/.zen/tmp/coucou/${G1PUB}.COINS 2>/dev/null)
 ZEN=$(echo "($COINS - 1) * 10" | bc | cut -d '.' -f 1)
 
-echo "===== ${G1PUB} ===== ${COINS} G1 / ${ZEN} ZEN"
+echo "===== ${G1PUB} ===== ${COINS} G1 / ${ZEN} ZEN ($ME)"
 
 ## GET G1 WALLET HISTORY
 if [[ ${COINS} != "null" && $(echo "$COINS > 0" | bc -l) -eq 1 ]]; then
 
     [[ ! -s ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json ]] \
     && ${MY_PATH}/timeout.sh -t 5 $MY_PATH/jaklis/jaklis.py history -n 100 -p ${G1PUB} -j > ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json
-    echo "++ HISTORY OK"
 
+    if [[ ! -s ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json ]]; then
+        GVASERVER=$(${MY_PATH}/../tools/duniter_getnode.sh | tail -n 1)
+        ## Changing GVA SERVER in tools/jaklis/.env
+        [[ $(echo ${GVASERVER} | grep "/gva" ) ]] \
+            && cat ${MY_PATH}/../tools/jaklis/.env.template > tools/jaklis/.env \
+            && echo "NODE=${GVASERVER}" >> ${MY_PATH}/../tools/jaklis/.env \
+            && echo "OK. NEW GVA NODE : ${GVASERVER}" \
+            || echo "ERROR. BAD GVA NODE : ${GVASERVER}"
+    else
+        echo "++ HISTORY OK"
+    fi
 fi
 
 ## SCAN GCHANGE +