From cc1b7768a37f1d90c4ce4436974a3c6201c9d9a6 Mon Sep 17 00:00:00 2001 From: frennkie Date: Sat, 11 Jul 2020 22:09:55 +0200 Subject: [PATCH] fix auto unlock on testnet --- home.admin/config.scripts/lnd.unlock.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/home.admin/config.scripts/lnd.unlock.sh b/home.admin/config.scripts/lnd.unlock.sh index 4ab84473b..575a91a4b 100644 --- a/home.admin/config.scripts/lnd.unlock.sh +++ b/home.admin/config.scripts/lnd.unlock.sh @@ -6,12 +6,15 @@ if [ "$1" == "-h" ] || [ "$1" == "help" ]; then exit 1 fi +# load raspiblitz conf +source /mnt/hdd/raspiblitz.conf + # 1. parameter passwordC="$1" # check if wallet is already unlocked echo "# checking LND wallet ... (can take some time)" -walletLocked=$(sudo -u bitcoin /usr/local/bin/lncli getinfo 2>&1 | grep -c unlock) +walletLocked=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net getinfo 2>&1 | grep -c unlock) if [ ${walletLocked} -eq 0 ]; then echo "# OK LND wallet was already unlocked" exit 0 @@ -55,7 +58,7 @@ while [ ${fallback} -eq 0 ] loopCount=$(($loopCount +1)) echo "# calling: lncli unlock" - result=$(echo "$passwordC" | sudo -u bitcoin lncli unlock --recovery_window=5000 --stdin 2>&1) + result=$(echo "$passwordC" | sudo -u bitcoin lncli --chain=${network} --network=${chain}net unlock --recovery_window=5000 --stdin 2>&1) wasUnlocked=$(echo "${result}" | grep -c 'successfully unlocked') wrongPassword=$(echo "${result}" | grep -c 'invalid passphrase') if [ ${wasUnlocked} -gt 0 ]; then @@ -82,8 +85,8 @@ while [ ${fallback} -eq 0 ] # UNKOWN RESULT # check if wallet was unlocked anyway - walletLocked=$(sudo -u bitcoin /usr/local/bin/lncli getinfo 2>&1 | grep -c unlock) - if [ ${walletUnlocked} -eq 0 ]; then + walletLocked=$(sudo -u bitcoin /usr/local/bin/lncli --chain=${network} --network=${chain}net getinfo 2>&1 | grep -c unlock) + if [ "${walletUnlocked}" = "0" ]; then echo "# OK LND wallet unlocked" exit 0 fi @@ -113,7 +116,7 @@ do echo "############################" echo "Calling: lncli unlock" echo "Please re-enter Password C:" - lncli unlock --recovery_window=5000 + lncli --chain=${network} --network=${chain}net unlock --recovery_window=5000 # test unlock walletLocked=$(sudo -u bitcoin /usr/local/bin/lncli getinfo 2>&1 | grep -c unlock) @@ -123,4 +126,4 @@ do echo "# --> Was not able to unlock wallet ... try again or use CTRL-C to exit" fi -done \ No newline at end of file +done