From f73ab4a140e1174a9686cd85fb1830b402a045b7 Mon Sep 17 00:00:00 2001 From: qo-op Date: Fri, 12 Jun 2020 16:28:59 +0200 Subject: [PATCH] duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/tools/duniter_getnode.sh) --- g1sms/functions.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/g1sms/functions.sh b/g1sms/functions.sh index a9d1e19..fd71215 100755 --- a/g1sms/functions.sh +++ b/g1sms/functions.sh @@ -153,6 +153,9 @@ function sms_uid2key (){ sms_SEND "$ADMINPHONE" "ADMIN! INFO: $PHONE prend le même $ASKWALLET, que $LOCAL" sms_SEND "$LOCAL" "Sachez que $ASKWALLET est associé à un autre téléphone que le votre également!" fi + + duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/tools/duniter_getnode.sh) + if [[ "$LOCAL" != "" ]]; then # LOCAL G1sms account DESTRIB=$(cat /home/$YOU/.zen/g1sms/$LOCAL/_pub) @@ -174,7 +177,7 @@ function sms_uid2key (){ ##################### REWRITE TODO # SEARCH WITH SILKAJ log "__SUB:sms_uid2key: GETTING FROM SILKAJ MEMBER ID" - DESTRIB=$(silkaj id "$ASKWALLET" | grep -w "$ASKWALLET" | awk '{print $2}' | tail -n 1) + DESTRIB=$(silkaj -p "$duniter_server" id "$ASKWALLET" | grep -w "$ASKWALLET" | awk '{print $2}' | tail -n 1) log "__SUB:sms_uid2key: OUT OFF SWARM MEMBER wallet: $DESTRIB" # GET CESIUM+ geoPoint DATA (TODO: cron for GCHANGE SMS Alert) curl -s ${CESIUM}/user/profile/${DESTRIB} | jq '._source.geoPoint' > "/home/$YOU/.zen/g1sms/$PHONE/_uidgeo.json" @@ -186,7 +189,7 @@ function sms_uid2key (){ echo "$DESTRIB" > "$RIBFILE" echo "$ASKWALLET" > "$NAMEFILE" log "__SUB:sms_uid2key: NEW EXTERNAL RELATED $DESTRIB / FOR MEMBER OR WALLET = $ASKWALLET - INIT 0.1 TX" - duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/tools/duniter_getnode.sh) + INIT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms/$PHONE/secret.dunikey tx --output $DESTRIB --amount 1 --comment "[G1sms+] Porte Monnaie $(cat $UIDNAFILE) -> $(cat $NAMEFILE)" -y) log "__SUB:sms_uid2key: INIT = $INIT | Create Connection with related Wallet."