From 8e1c375a8a85fce8ab0cb98c798912cf36fad42b Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Sat, 3 Jul 2021 00:15:26 +0200
Subject: [PATCH] edit the unlock

---
 home.admin/00raspiblitz.sh     | 13 +------------
 home.admin/_bootstrap.sh       |  6 +++---
 home.admin/_provision.setup.sh | 15 ---------------
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/home.admin/00raspiblitz.sh b/home.admin/00raspiblitz.sh
index 36a083725..826fd0d49 100755
--- a/home.admin/00raspiblitz.sh
+++ b/home.admin/00raspiblitz.sh
@@ -103,7 +103,7 @@ do
   ############################
   # LND Wallet Unlock
 
-  if [ "${walletLocked}" == "1" ]; then
+  if [ "${walletLocked}" == "1" ] && [ "${state}" == "ready" ]; then
     /home/admin/config.scripts/lnd.unlock.sh
   fi
 
@@ -200,17 +200,6 @@ do
 
   fi
 
-  #####################################
-  # AFTER SETUP: Handle System States 
-  #####################################
-
-  if [ "${setupPhase}" == "done" ]; then
-    echo "# AFTER SETUP: Handle System States "
-  fi
-
-  # debug wait
-  sleep 3
-
 done
 
 echo "# menu loop received exit code ${exitMenuLoop} --> exit to terminal"
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index d5020ff5b..84dbdd75d 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -556,12 +556,12 @@ if [ ${isMounted} -eq 0 ]; then
 
   # unlock lnd if needed
   source ${setupFile}
-  if [ "${lightning}" == "lnd" ]; then
-    echo "Unlock LND at end of provision ..." >> $logFile
+  if [ "${lightning}" == "lnd" ] && [ "${${passwordC}}" != "" ]; then
+    echo "Unlock LND at end of provision with temp stored password C ..." >> $logFile
     /home/admin/config.scripts/lnd.unlock.sh unlock "${passwordC}" >> ${logFile}
     sleep 3
   else
-    echo "No lightning unlock (${lightning})" >> $logFile
+    echo "No lightning unlock (${lightning}) or password C temp stored" >> $logFile
   fi
 
   # mark provision process done
diff --git a/home.admin/_provision.setup.sh b/home.admin/_provision.setup.sh
index 6cc46db3f..42e29787f 100755
--- a/home.admin/_provision.setup.sh
+++ b/home.admin/_provision.setup.sh
@@ -301,11 +301,6 @@ if [ "${lightning}" == "lnd" ]; then
   echo "*** Copy LND Macaroons to user admin ***" >> ${logFile}
   sudo sed -i "s/^message=.*/message='LND Credentials'/g" ${infoFile}    
 
-  # make sure wallet is unlocked
-  sleep 3
-  /home/admin/config.scripts/lnd.unlock.sh unlock "${passwordC}" >> ${logFile}
-  sleep 3
-
   # check if macaroon exists now - if not fail
   macaroonExists=$(sudo -u bitcoin ls -la /home/bitcoin/.lnd/data/chain/${network}/${chain}net/admin.macaroon 2>/dev/null | grep -c admin.macaroon)
   if [ ${macaroonExists} -eq 0 ]; then
@@ -318,16 +313,6 @@ if [ "${lightning}" == "lnd" ]; then
   # now sync macaroons & TLS zo other users
   sudo /home/admin/config.scripts/lnd.credentials.sh sync >> ${logFile}
 
-  # unlock Wallet (if needed)
-  echo "*** Check Wallet Lock ***" >> ${logFile}
-  source <(/home/admin/config.scripts/lnd.unlock.sh status)
-  if [ "${locked}" != "0" ]; then
-    echo "OK - Wallet is locked ... starting unlocking dialog" >> ${logFile}
-    /home/admin/config.scripts/lnd.unlock.sh unlock "${passwordC}" >> ${logFile}
-  else
-    echo "OK - Wallet is already unlocked" >> ${logFile}
-  fi
-
   # make a final lnd check
   source <(/home/admin/config.scripts/lnd.check.sh basic-setup)
   if [ "${err}" != "" ]; then