Merge pull request #226 from geco91/master

small fixes
This commit is contained in:
Christian Rotzoll 2019-01-10 00:17:59 +01:00 committed by GitHub
commit 783c5de56f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 9 deletions

View file

@ -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:

View file

@ -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

View file

@ -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

View file

@ -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."