Browse Source

added missing lncli testnet parameter

dev
rootzoll 6 years ago
parent
commit
544e869e2a
  1. 2
      home.admin/00infoLCD.sh
  2. 4
      home.admin/00mainMenu.sh
  3. 2
      home.admin/00settingsMenuServices.sh
  4. 8
      home.admin/BBcashoutWallet.sh
  5. 4
      home.admin/BBcloseAllChannels.sh

2
home.admin/00infoLCD.sh

@ -167,7 +167,7 @@ while :
fi
# check if locked
locked=$(sudo -u admin lncli --chain=${network} getinfo 2>&1 | grep -c unlock)
locked=$(sudo -u admin lncli --chain=${network} --network=${chain}net getinfo 2>&1 | grep -c unlock)
if [ "${locked}" -gt 0 ]; then
# special case: LND wallet is locked ---> show unlock info

4
home.admin/00mainMenu.sh

@ -113,7 +113,7 @@ waitUntilChainNetworkIsReady()
boxwidth=40
dialog --backtitle "RaspiBlitz ${localip} - Welcome" --infobox "$l1$l2$l3" 5 ${boxwidth}
else
locked=$(lncli --chain=${network} getinfo 2>&1 | grep -c unlock)
locked=$(lncli --chain=${network} --network=${chain}net getinfo 2>&1 | grep -c unlock)
if [ ${locked} -gt 0 ]; then
./AAunlockLND.sh
echo "please wait ... update to next screen can be slow"
@ -226,7 +226,7 @@ else
fi
# Depending Options
openChannels=$(sudo -u bitcoin /usr/local/bin/lncli listchannels 2>/dev/null | jq '.[] | length')
openChannels=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | jq '.[] | length')
if [ ${openChannels} -gt 0 ]; then
OPTIONS+=(CLOSEALL "Close all open Channels")
fi

2
home.admin/00settingsMenuServices.sh

@ -71,7 +71,7 @@ if [ "${chain}" != "${choice}" ]; then
echo "B) Answere 'n' because you dont have a 'cipher seed mnemonic' (24 words) yet"
echo "C) For 'passphrase' to encrypt your 'cipher seed' use PASSWORD D (optional)"
echo "****************************************************************************"
sudo -u bitcoin /usr/local/bin/lncli --chain=${network} create 2>error.out
sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net create 2>error.out
error=`sudo cat error.out`
if [ ${#error} -eq 0 ]; then
sleep 2

8
home.admin/BBcashoutWallet.sh

@ -12,7 +12,7 @@ if [ ${#chain} -eq 0 ]; then
fi
# check if user has money in lightning channels - info about close all
openChannels=$(lncli --chain=${network} listchannels 2>/dev/null | jq '.[] | length')
openChannels=$(lncli --chain=${network} --network=${chain}net listchannels 2>/dev/null | jq '.[] | length')
if [ ${#openChannels} -eq 0 ]; then
clear
echo "*** IMPORTANT **********************************"
@ -28,14 +28,14 @@ if [ ${openChannels} -gt 0 ]; then
fi
# check if money is waiting to get confirmed
unconfirmed=$(lncli --chain=${network} walletbalance | grep '"unconfirmed_balance"' | cut -d '"' -f4)
unconfirmed=$(lncli --chain=${network} --network=${chain}net walletbalance | grep '"unconfirmed_balance"' | cut -d '"' -f4)
if [ ${unconfirmed} -gt 0 ]; then
dialog --title 'Info' --msgbox "Still waiting confirmation for ${unconfirmed} sat.\nNOTICE: Just confirmed on-chain funds can be moved." 6 58
echo "please wait ..."
fi
# get available amount in on-chain wallet
maxAmount=$(lncli --chain=${network} walletbalance | grep '"confirmed_balance"' | cut -d '"' -f4)
maxAmount=$(lncli --chain=${network} --network=${chain}net walletbalance | grep '"confirmed_balance"' | cut -d '"' -f4)
if [ ${maxAmount} -eq 0 ]; then
dialog --title 'Info' --msgbox "You have 0 moveable funds available.\nNOTICE: Just confirmed on-chain funds can be moved." 6 58
exit 1
@ -78,7 +78,7 @@ while [ ${tryAgain} -eq 1 ]
echo "TRY #${count} ---> with max fee ${fee} sat:"
# execute command
command="lncli --chain=${network} sendcoins --addr ${address} --amt ${amount} --conf_target 3"
command="lncli --chain=${network} --network=${chain}net sendcoins --addr ${address} --amt ${amount} --conf_target 3"
echo "$command"
result=$($command 2>$_error)
error=`cat ${_error}`

4
home.admin/BBcloseAllChannels.sh

@ -13,7 +13,7 @@ if [ "${autoPilot}" = "on" ]; then
exit 1
fi
command="lncli --chain=${network} closeallchannels --force"
command="lncli --chain=${network} --network=${chain}net closeallchannels --force"
clear
echo "***********************************"
@ -26,7 +26,7 @@ echo ""
echo "RESULT:"
# PRECHECK) check if chain is in sync
chainInSync=$(lncli --chain=${network} getinfo | grep '"synced_to_chain": true' -c)
chainInSync=$(lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c)
if [ ${chainInSync} -eq 0 ]; then
command=""
result="FAIL PRECHECK - lncli getinfo shows 'synced_to_chain': false - wait until chain is sync "

Loading…
Cancel
Save