diff --git a/README.md b/README.md index 2aae674c8..e7571c475 100644 --- a/README.md +++ b/README.md @@ -393,7 +393,6 @@ What you do is in priciple: This is highly experimental. And again: If you restore the LND with an backup that is not representing the latest channel state, this will trigger the lightning "penalty" mechanism - allowing your channel counter part to grab all the funds from a channel. Its a measure of last resort. But if its working for you, let us know. - ## Mobile Development: Connect RaspiBlitz without a Router/Switch To connect a RaspiBlitz directly (without a router/switch) to your laptop and share the WIFI internet connection, you can follow this [guide for OSX](https://medium.com/@tzhenghao/how-to-ssh-into-your-raspberry-pi-with-a-mac-and-ethernet-cable-636a197d055). In short: diff --git a/home.admin/00infoLCD.sh b/home.admin/00infoLCD.sh index ed1db097e..e0ead6fb6 100755 --- a/home.admin/00infoLCD.sh +++ b/home.admin/00infoLCD.sh @@ -72,9 +72,15 @@ while : # before setup even started if [ ${setupStep} -eq 0 ]; then - + + # check for internet connection + # https://en.wikipedia.org/wiki/1.1.1.1 + online=$(ping 1.1.1.1 -c 1 -W 2 | grep -c '1 received') + if [ ${online} -eq 0 ]; then + message="no internet connection" + # when in presync - get more info on progress - if [ "${state}" = "presync" ]; then + elif [ "${state}" = "presync" ]; then # get blockchain sync progress blockchaininfo="$(sudo -u root bitcoin-cli -conf=/home/admin/assets/bitcoin.conf getblockchaininfo 2>/dev/null)" message="starting" @@ -83,15 +89,13 @@ while : message=$(echo "${message}*100" | bc) message="${message}%" fi - fi # when old data - improve message - if [ "${state}" = "olddata" ]; then + elif [ "${state}" = "olddata" ]; then message="login for manual migration" - fi # when no HDD - improve message - if [ "${state}" = "nohdd" ]; then + elif [ "${state}" = "nohdd" ]; then message="Connect HHD" fi diff --git a/home.admin/80scanLND.sh b/home.admin/80scanLND.sh index 6e4292fb5..81c626372 100755 --- a/home.admin/80scanLND.sh +++ b/home.admin/80scanLND.sh @@ -27,8 +27,13 @@ if [ ${#item} -eq 0 ]; then fi # if no progress info +online=1 if [ ${#item} -eq 0 ]; then item="?" + + # check if offline + # https://en.wikipedia.org/wiki/1.1.1.1 + online=$(ping 1.1.1.1 -c 1 -W 2 | grep -c '1 received') fi # get total number of blocks @@ -48,7 +53,11 @@ isWaitingBlockchain=$( sudo -u bitcoin tail -n 2 /mnt/hdd/lnd/logs/${network}/${ if [ ${isWaitingBlockchain} -gt 0 ]; then isInitialChainSync=1 fi -if [ ${isInitialChainSync} -gt 0 ]; then +if [ ${online} -eq 0 ]; then + heigh=7 + width=44 + infoStr=$(echo " Waiting INTERNET CONNECTION\n RaspiBlitz cannot ping 1.1.1.1\n Local IP is ${localip}\n Please check cables and router.") +elif [ ${isInitialChainSync} -gt 0 ]; then heigh=7 infoStr=" Waiting for final Blockchain Sync\n Progress: ${progress} %\n Please wait - this can take some time.\n ssh admin@${localip}\n Password A" if [ "$USER" = "admin" ]; then diff --git a/home.admin/97addMobileWalletShango.sh b/home.admin/97addMobileWalletShango.sh index 8f20b280b..bff9ec535 100644 --- a/home.admin/97addMobileWalletShango.sh +++ b/home.admin/97addMobileWalletShango.sh @@ -41,9 +41,10 @@ read key clear echo "*** STEP 2 : SCAN MACAROON (make whole QR code fill camera) ***" -echo -e "${myip}:10009,\n$(xxd -p -c2000 ./.lnd/data/chain/bitcoin/mainnet/admin.macaroon)," > qr.txt && cat ./.lnd/tls.cert >>qr.txt && qrencode -t ANSIUTF8 < qr.txt +echo -e "${myip}:10009,\n$(xxd -p -c2000 ./.lnd/data/chain/${network}/${chain}net/admin.macaroon)," > qr.txt && cat ./.lnd/tls.cert >>qr.txt && qrencode -t ANSI256 < qr.txt echo "(To shrink QR code: OSX->CMD- / LINUX-> CTRL-) Press ENTER when finished." read key +shred qr.txt clear echo "Now press 'Connect' within the Shango Wallet." diff --git a/home.admin/_background.sh b/home.admin/_background.sh index 07fb97030..f4113ae3e 100644 --- a/home.admin/_background.sh +++ b/home.admin/_background.sh @@ -126,7 +126,7 @@ do # building REST command passwordC=$(cat /root/lnd.autounlock.pwd) - sudo python /home/admin/config.scripts/lnd.unlock.py $passwordC + sudo python /home/admin/config.scripts/lnd.unlock.py '$passwordC' #walletPasswordBase64=$(cat /root/lnd.autounlock.pwd | tr -d '\n' | base64 -w0) #MACAROON_HEADER="Grpc-Metadata-macaroon: $(xxd -ps -u -c 1000 /mnt/hdd/lnd/data/chain/${network}/${chain}net/admin.macaroon)" diff --git a/shoppinglist_cn.md b/shoppinglist_cn.md index b32e98174..c5712330b 100644 --- a/shoppinglist_cn.md +++ b/shoppinglist_cn.md @@ -2,20 +2,18 @@ *The RaspiBlitz software is build and tested for the following Hardware set that you can buy cheap on taobao.com:* -Set (¥378.00 CNY) +Set RaspBerry Pi + accessories (¥378.00 CNY) : * RaspBerry Pi 3 B+ * Micro SD-Card 16GB * Power Unit 2.5A * several items (e.g. cooling fins) https://item.taobao.com/item.htm?spm=a1z09.2.0.0.46982e8dibAzMc&id=550270480898&_u=b110k44d3302 -Single HDD (Bulk) +Single HDD (Bulk) : * 1TB Hard Drive (¥379.00 CNY) https://detail.tmall.com/item.htm?id=38476523976&spm=a1z09.2.0.0.46982e8dibAzMc&_u=b110k44d53f4&sku_properties=5919063:6536025 -Set (¥119.00 CNY) -* LCD-Display -* Case (acrylic) -https://item.taobao.com/item.htm?spm=a1z09.2.0.0.46982e8dibAzMc&id=576167736126&_u=b110k44df816 +Set LCD Display + Clear case (acrylic) (¥110.00 CNY) : +https://item.taobao.com/item.htm?spm=a230r.1.14.1.66245df05JM71C&id=579623655270&ns=1&abbucket=3#detail -**Total Price: ¥876.00 CNY** approx. 111 EUR or 128 USD +**Total Price: ¥867.00 CNY** approx. 111 EUR or 128 USD