From 2ded9deb981cb0d374473dea7b098a185a8a6533 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 18 Jan 2022 00:16:27 +0100
Subject: [PATCH] set recovery window by default

---
 home.admin/99lndRepairMenu.sh           | 2 +-
 home.admin/config.scripts/lnd.unlock.sh | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/home.admin/99lndRepairMenu.sh b/home.admin/99lndRepairMenu.sh
index a0a567e52..20cee39d6 100644
--- a/home.admin/99lndRepairMenu.sh
+++ b/home.admin/99lndRepairMenu.sh
@@ -246,7 +246,7 @@ function restoreSCB()
         fi
       fi
 
-      echo "WALLET --> SCB "
+      echo "WALLET --> SEED + SCB "
       /home/admin/_cache.sh set message "LND Wallet (SEED & SCB)"
       macaroonPath="/home/admin/.lnd/data/chain/${network}/${chain}net/admin.macaroon"
       source <(/home/admin/config.scripts/lnd.initwallet.py scb ${chain}net "/home/admin/channel.backup" "${macaroonPath}")
diff --git a/home.admin/config.scripts/lnd.unlock.sh b/home.admin/config.scripts/lnd.unlock.sh
index e0b3a81a6..4b1b63f94 100755
--- a/home.admin/config.scripts/lnd.unlock.sh
+++ b/home.admin/config.scripts/lnd.unlock.sh
@@ -96,12 +96,7 @@ while [ ${fallback} -eq 0 ]
 
     loopCount=$(($loopCount +1))
     echo "# calling: lncli unlock"
-    recoveryOption=""
-    if [ "${fundRecovery}" == "1" ]; then
-        recoveryOption="--recovery_window=1000 "
-        echo "# running unlock with ${recoveryOption}"
-    fi
-    result=$(echo "$passwordC" | $lncli_alias unlock ${recoveryOption}--stdin 2>&1)
+    result=$(echo "$passwordC" | $lncli_alias unlock --recovery_window=1000 --stdin 2>&1)
     wasUnlocked=$(echo "${result}" | grep -c 'successfully unlocked')
     wrongPassword=$(echo "${result}" | grep -c 'invalid passphrase')
     if [ ${wasUnlocked} -gt 0 ]; then