diff --git a/build_sdcard.sh b/build_sdcard.sh index e52865a62..77a51327c 100644 --- a/build_sdcard.sh +++ b/build_sdcard.sh @@ -582,12 +582,19 @@ sudo -u admin bash -c "cd; python3 -m venv --system-site-packages python3-env-ln sudo -u admin bash -c "/home/admin/python3-env-lnd/bin/python3 -m pip install grpcio grpcio-tools googleapis-common-protos pathlib2" echo "" -echo "" -echo "*** RASPIBLITZ EXTRAS ***" +echo "*** Python DEFAULT libs & depenedencies ***" # for setup schell scripts sudo apt-get -y install dialog bc python3-dialog +# libs +sudo pip3 install -I grpcio==1.29.0 +sudo pip3 install -I googleapis-common-protos==1.51.0 + + +echo "" +echo "*** RASPIBLITZ EXTRAS ***" + # enable copy of blockchain from 2nd HDD formatted with exFAT sudo apt-get -y install exfat-fuse diff --git a/home.admin/config.scripts/blitz.ip2tor.py b/home.admin/config.scripts/blitz.ip2tor.py index 9b5fa9d6d..3ecadcfb5 100644 --- a/home.admin/config.scripts/blitz.ip2tor.py +++ b/home.admin/config.scripts/blitz.ip2tor.py @@ -28,7 +28,7 @@ if Path("/mnt/hdd/raspiblitz.conf").is_file(): cfg.reload() DEFAULT_SHOPURL="shopdeu2vdhazvmllyfagdcvlpflzdyt5gwftmn4hjj3zw2oyelksaid.onion" LND_IP="127.0.0.1" - LND_ADMIN_MACAROON_PATH="/mnt/hdd/app-data/lnd/data/chain/{0}/{1}net/admin.macaroon" + LND_ADMIN_MACAROON_PATH="/mnt/hdd/app-data/lnd/data/chain/{0}/{1}net/admin.macaroon".format(cfg.network,cfg.chain) LND_TLS_PATH="/mnt/hdd/app-data/lnd/tls.cert" else: print("# blitz.ip2tor.py (development env)") @@ -44,12 +44,8 @@ def eprint(*args, **kwargs): def parseDate(datestr): return datetime.datetime.strptime(datestr,"%Y-%m-%dT%H:%M:%S.%fZ") -SERVERSECONDSDIFF=0 -def setServerTimeDiff(serverTimeDiffSeconds): - SERVERSECONDSDIFF=serverTimeDiffSeconds - def secondsLeft(dateObj): - return round((dateObj - datetime.datetime.now()).total_seconds())-SERVERSECONDSDIFF + return round((dateObj - datetime.datetime.utcnow().total_seconds())-SERVERSECONDSDIFF #date1=parseDate("2020-05-24T22:25:11.630504Z") #date2=parseDate("2020-05-25T22:25:11.630504Z") @@ -292,6 +288,7 @@ def lndDecodeInvoice(lnInvoiceString): return except Exception as e: + eprint(e) print("error='FAILED LND INVOICE DECODING'") return @@ -391,11 +388,11 @@ bridge_id = bridge['id'] bridge_suspendafter = bridge['suspend_after'] bridge_port = bridge['port'] -print("#### CHECK IF DURATION DELIVERED AS PROMISED") +print("#### CHECK IF DURATION DELIVERED AS PROMISED (1 hour tolerance)") contract_broken=False secondsDelivered=secondsLeft(parseDate(bridge_suspendafter)) print("delivered({0}) promised({1})".format(secondsDelivered, duration)) -if (secondsDelivered + 600) < duration: +if (secondsDelivered + 3600) < duration: print("CONTRACT BROKEN - duration delivered is too small") contract_broken=True sys.exit()