From 2eab1be7336deda4af79a364037622b6b853bf68 Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Thu, 8 Apr 2021 18:04:16 +0200
Subject: [PATCH] #2057 Recovery Window Flag `fundRecovery` (#2159)

---
 home.admin/70initLND.sh                 |  4 +++-
 home.admin/_bootstrap.sh                |  2 ++
 home.admin/_commands.sh                 | 15 +++++++++------
 home.admin/config.scripts/lnd.unlock.sh | 10 ++++++++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index 4fbcedc7c..d75117afa 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -374,7 +374,6 @@ to protect the seed words. Most users did not set this.
     if [ "${CHOICE}" == "SEED+SCB" ] || [ "${CHOICE}" == "ONLYSEED" ]; then
 
       # trigger wallet recovery
-      source /home/admin/python3-env-lnd/bin/activate
       source <(python3 /home/admin/config.scripts/lnd.initwallet.py seed ${passwordC} "${wordstring}" ${passwordD} 2>/dev/null)
 
       # check if wallet was created for real
@@ -385,6 +384,9 @@ to protect the seed words. Most users did not set this.
         fi
       fi
 
+      # set fundRecovery=1 in raspiblitz.info
+      sed -i "s/^fundRecovery=.*/fundRecovery=1/g" /home/admin/raspiblitz.info
+
       # user feedback
       if [ ${#err} -eq 0 ]; then
         dialog --title " SUCCESS " --msgbox "
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index e0b6add10..e985a732a 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -72,6 +72,7 @@ fsexpanded=0
 # see https://github.com/rootzoll/raspiblitz/issues/1265#issuecomment-813369284
 displayClass="lcd"
 displayType=""
+fundRecovery=0
 
 # try to load old values if available (overwrites defaults)
 source ${infoFile} 2>/dev/null
@@ -91,6 +92,7 @@ echo "fsexpanded=${fsexpanded}" >> $infoFile
 echo "displayClass=${displayClass}" >> $infoFile
 echo "displayType=${displayType}" >> $infoFile
 echo "setupStep=${setupStep}" >> $infoFile
+echo "fundRecovery=${fundRecovery}" >> $infoFile
 if [ "${setupStep}" != "100" ]; then
   echo "hostname=${hostname}" >> $infoFile
 fi
diff --git a/home.admin/_commands.sh b/home.admin/_commands.sh
index 546926dea..cf2f29449 100755
--- a/home.admin/_commands.sh
+++ b/home.admin/_commands.sh
@@ -30,6 +30,12 @@ function repair() {
   ./98repairMenu.sh
 }
 
+# command: restart
+function restart() {
+  cd /home/admin
+  ./XXshutdown.sh reboot
+}
+
 # command: sourcemode
 function sourcemode() {
   cd /home/admin
@@ -54,12 +60,6 @@ function patch() {
   ./XXsyncScripts.sh -run
 }
 
-# command: restart
-function restart() {
-  cd /home/admin
-  ./XXshutdown.sh reboot
-}
-
 # command: off
 function off() {
   cd /home/admin
@@ -77,18 +77,21 @@ function github() {
 function hdmi() {
   echo "# SWITCHING VIDEO OUTPUT TO --> HDMI"
   sudo /home/admin/config.scripts/blitz.display.sh set-display hdmi
+  restart
 }
 
 # command: lcd
 function lcd() {
   echo "# SWITCHING VIDEO OUTPUT TO --> LCD"
   sudo /home/admin/config.scripts/blitz.display.sh set-display lcd
+  restart
 }
 
 # command: headless
 function headless() {
   echo "# SWITCHING VIDEO OUTPUT TO --> HEADLESS"
   sudo /home/admin/config.scripts/blitz.display.sh set-display headless
+  restart
 }
 
 # command: manage
diff --git a/home.admin/config.scripts/lnd.unlock.sh b/home.admin/config.scripts/lnd.unlock.sh
index b54758939..d781e10e3 100755
--- a/home.admin/config.scripts/lnd.unlock.sh
+++ b/home.admin/config.scripts/lnd.unlock.sh
@@ -6,7 +6,8 @@ if [ "$1" == "-h" ] || [ "$1" == "help" ]; then
  exit 1
 fi
 
-# load raspiblitz conf
+# load raspiblitz info & conf
+source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
 
 # 1. parameter
@@ -58,7 +59,12 @@ while [ ${fallback} -eq 0 ]
 
     loopCount=$(($loopCount +1))
     echo "# calling: lncli unlock"
-    result=$(echo "$passwordC" | sudo -u bitcoin lncli --chain=${network} --network=${chain}net unlock --stdin 2>&1)
+    recoveryOption=""
+    if [ "${fundRecovery}" == "1" ]; then
+        recoveryOption="--recovery_window=1000 "
+        echo "# runnign unlock with ${recoveryOption}"
+    fi
+    result=$(echo "$passwordC" | sudo -u bitcoin lncli --chain=${network} --network=${chain}net unlock ${recoveryOption}--stdin 2>&1)
     wasUnlocked=$(echo "${result}" | grep -c 'successfully unlocked')
     wrongPassword=$(echo "${result}" | grep -c 'invalid passphrase')
     if [ ${wasUnlocked} -gt 0 ]; then