diff --git a/g1sms/cron_VIR.recurrent.sh b/g1sms/cron_VIR.recurrent.sh index b61e43e..6fd612e 100755 --- a/g1sms/cron_VIR.recurrent.sh +++ b/g1sms/cron_VIR.recurrent.sh @@ -41,14 +41,15 @@ while read line NB=${virement[7]} sms_INIT_ACCOUNT "$PHONE" "NOSMS" - # echo -salt="$PHONE" -password="$PIN" --amount="$VIR" --output="$DESTRIB" --comment="[G1sms+] VIR $REF / $NB" - PAY=$(./silkaj/silkaj transaction --auth-scrypt -salt="$PHONE" -password="$PIN" --amount="$VIR" --output="$DESTRIB" --comment="[G1sms+] VIR $REF / $NB" -y) - if [[ "$(echo $PAY | cut -d '|' -f 1)" == "KO" ]]; then - sms_ERROR "$PHONE" "Il est survenu un problème avec votre virement. Retour silkaj: $PAY ... $new"; + + duniter_server=$(./tools/duniter_getnode.sh) + PAY=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$DESTRIB" --amount "$VIR" --comment "[G1sms+] VIR $REF / $NB" -y) + if [[ "$(echo $PAY | grep 'successful')" == "" || "$PAY" == "" ]]; then + sms_ERROR "$PHONE" "Problème Virement. $PAY"; else - sms_SEND "$PHONE" "$TODAY Virement automatique $REF vers $DESTUID : $PAY (Reste $NB)" + sms_SEND "$PHONE" "$TODAY Virement automatique $REF vers $DESTUID (Reste $NB) : $PAY" fi - log "__SUB:cron_VIR.reccurent.sh: $TODAY VIR DONE.... Rotation Silkaj : $new " + log "__SUB:cron_VIR.reccurent.sh: $TODAY VIR DONE...." else virement="" echo "$(declare -p virement)" @@ -57,7 +58,7 @@ done < /tmp/VIR$TODAY # CHECK FOR LAST VIREMENTS AND CLEAN IT? for virfile in "/home/$YOU/.zen/g1sms_wallets/*/VIREMENTS.gpg"; do - phone=$(echo $virfile | cut -d '/' -f 3) + phone=$(echo $virfile | cut -d '/' -f 6) if [[ "$phone" == "*" ]]; then exit; fi echo "${IPFSPrivKey}" | gpg -d -q --output "/tmp/$phone.VIREMENTS" --yes --pinentry-mode loopback --passphrase-fd 0 "/home/$YOU/.zen/g1sms_wallets/$phone/VIREMENTS.gpg" nv=0; tot=0; diff --git a/g1sms/sms_PAY.sh b/g1sms/sms_PAY.sh index 3fd8db2..c10f1b0 100755 --- a/g1sms/sms_PAY.sh +++ b/g1sms/sms_PAY.sh @@ -13,7 +13,7 @@ PHONEDEST="$2" # Initialise PHONE, PIN, PUBKEY, UNIT sms_INIT_ACCOUNT "$phone" "NOSMS" -pin=$PIN + if [[ $UNKNOWN == "unknown" ]]; then sms_ERROR "$phone" "Porte-monnaie inconnu. Envoyez N (suivi de votre Pseudo membre) pour le créer." exit 1 diff --git a/g1sms/sms_REC.sh b/g1sms/sms_REC.sh index 7ec1088..dd38273 100755 --- a/g1sms/sms_REC.sh +++ b/g1sms/sms_REC.sh @@ -90,8 +90,8 @@ else ##################### REWRITE TODO # SEARCH IN WALLETS SWARM (MEMBER THEN UIDNA) -# INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidname | tail -n 1 | cut -f 3 -d '/') -# if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidna | tail -n 1 | cut -f 3 -d '/'); fi +# INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidname | tail -n 1 | cut -f 6 -d '/') +# if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidna | tail -n 1 | cut -f 6 -d '/'); fi # if [[ "$INSWARM" != "" ]]; then # REMOTENODE=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/MASTERPHONE.sms) # DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/$INSWARM.pub) diff --git a/g1sms/sms_VIR.sh b/g1sms/sms_VIR.sh index eb415e3..84660b2 100755 --- a/g1sms/sms_VIR.sh +++ b/g1sms/sms_VIR.sh @@ -59,8 +59,8 @@ else ##################### REWRITE TODO # SEARCH IN WALLETS SWARM (MEMBER THEN UIDNA) -# INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidname | tail -n 1 | cut -f 3 -d '/') -# if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidna | tail -n 1 | cut -f 3 -d '/'); fi +# INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidname | tail -n 1 | cut -f 6 -d '/') +# if [[ "$INSWARM" == "" ]]; then INSWARM=$(grep -Rwl "$DESTMEM" /home/$YOU/.zen/g1sms_wallets_swarm/*/*.uidna | tail -n 1 | cut -f 6 -d '/'); fi # if [[ "$INSWARM" != "" ]]; then # REMOTENODE=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/MASTERPHONE.sms) # DESTRIB=$(cat /home/$YOU/.zen/g1sms_wallets_swarm/$INSWARM/$INSWARM.pub)