diff --git a/g1sms/init.sh b/g1sms/init.sh index 726b32e..989ec79 100755 --- a/g1sms/init.sh +++ b/g1sms/init.sh @@ -38,10 +38,7 @@ fi ################################################################## # Country Node Phone international prefix (TODO Worldwide) export COUNTRY="+33" - ################################################################## - # DU has a G1 value changed every 6 month! - # ./_DU Updated by cron_CODE.backup.sh - if [[ -f "./_DU" ]]; then export DUFACTOR=$(bc <<< "scale=2; $(cat "./_DU") / 100"); else log "__SUB:init.sh: FAILING TO FIND ./_DU EXIT!!!"; exit; fi + ################################################################## # Choose Default Unit: G1, DU, LOVE (DU cents), ZEN (G1 cents) export COIN="G1" @@ -60,18 +57,28 @@ fi ################################################################## # SMS SIM Card Phone Number export MASTERPHONE="+33695196729" - export ADRESSE="G1FabLab" + export ADRESSE="G1Pub" export G1DAB="NO" ################################################################## # ADMIN COMMAND PHONE ORIGIN - export ADMINPHONE="+33695196729" + export ADMINPHONE="+33647683646" export ADMINPSEUDO="Fred" ################################################################## # DUNITER/CESIUM+ DEFAULT SERVERS export DUNITER="https://g1.duniter.org" export CESIUM="https://g1.data.le-sou.org" - + ################################################################## + # DU has a G1 value changed every 6 month! + # "~/.zen/_DU" removed every 6 month for refresh + if [[ -f ~/.zen/_DU ]]; then + export DUFACTOR=$(bc <<< "scale=2; $(cat ~/.zen/_DU) / 100") + else + LASTDU=$(curl -s ${DUNITER}/blockchain/with/ud | jq '.result.blocks[]' | tail -n 1) || exit 1 + [[ $LASTDU != "" ]] && curl -s ${DUNITER}/blockchain/block/${LASTDU} | jq -r '.dividend' > ~/.zen/_DU || exit 1 + export DUFACTOR=$(bc <<< "scale=2; $(cat ~/.zen/_DU) / 100") + fi + # TODO Use latest Silkaj from "sudo fredp3 install silkaj" # export SILKAJ="/usr/local/bin/silkaj" source $MY_PATH/init_keys.sh diff --git a/www/LOVEBank/ajax.php b/www/LOVEBank/ajax.php index 8c561cf..b3821b2 100644 --- a/www/LOVEBank/ajax.php +++ b/www/LOVEBank/ajax.php @@ -1,6 +1,6 @@