From cb04f094835a413aa353f92b1ebfa46083b395c0 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 20 Jul 2021 17:45:38 +0200
Subject: [PATCH] no password C & D when cln

---
 home.admin/config.scripts/cln.backup.sh          | 16 +---------------
 home.admin/setup.scripts/controlSetupDialog.sh   |  4 ++++
 .../setup.scripts/dialogLightningWallet-cln.sh   |  8 ++++----
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/home.admin/config.scripts/cln.backup.sh b/home.admin/config.scripts/cln.backup.sh
index 110d41a96..eac29520f 100755
--- a/home.admin/config.scripts/cln.backup.sh
+++ b/home.admin/config.scripts/cln.backup.sh
@@ -380,22 +380,8 @@ wordone wordtweo wordthree ...
       fi
     done
 
-  # ask if seed was protected by password D
+  # dont ask for password D (seed password) because raspiblitz never had that option for cln
   passwordD=""
-  dialog --title "SEED PASSWORD" --yes-button "No extra Password" --no-button "Yes" --yesno "
-Are your seed words protected by an extra password?
-
-During wallet creation LND offers to set an extra password
-to protect the seed words. Most users did not set this.
-  " 11 65
-  if [ $? -eq 1 ]; then
-    sudo rm /var/cache/raspiblitz/.pass.tmp 2>/dev/null
-    sudo touch /var/cache/raspiblitz/.pass.tmp
-    sudo chown admin:admin /var/cache/raspiblitz/.pass.tmp
-    sudo /home/admin/config.scripts/blitz.setpassword.sh x "Enter extra Password D" /var/cache/raspiblitz/.pass.tmp empty-allowed
-    passwordD=$(sudo cat /var/cache/raspiblitz/.pass.tmp)
-    sudo shred -u /var/cache/raspiblitz/.pass.tmp 2>/dev/null
-  fi
 
   # writing result file data
   clear
diff --git a/home.admin/setup.scripts/controlSetupDialog.sh b/home.admin/setup.scripts/controlSetupDialog.sh
index e2637158c..a445e90cd 100755
--- a/home.admin/setup.scripts/controlSetupDialog.sh
+++ b/home.admin/setup.scripts/controlSetupDialog.sh
@@ -293,6 +293,10 @@ if [ "${setupPhase}" == "setup" ]; then
     echo "setPasswordA=1" >> $SETUPFILE
     echo "setPasswordB=1" >> $SETUPFILE
     echo "setPasswordC=1" >> $SETUPFILE
+
+
+
+    
   fi
 
 fi
diff --git a/home.admin/setup.scripts/dialogLightningWallet-cln.sh b/home.admin/setup.scripts/dialogLightningWallet-cln.sh
index bbb8f215d..1b486d6e8 100644
--- a/home.admin/setup.scripts/dialogLightningWallet-cln.sh
+++ b/home.admin/setup.scripts/dialogLightningWallet-cln.sh
@@ -23,10 +23,10 @@ if [ "${CHOICE}" == "NEW" ]; then
   sudo sed -i '/^setPasswordB=/d' $SETUPFILE
   sudo sed -i '/^setPasswordC=/d' $SETUPFILE
 
-  # mark all passwords to be set at the end
+  # mark all passwords to be set - passwordc wallet encryption not for cln 
   echo "setPasswordA=1" >> $SETUPFILE
   echo "setPasswordB=1" >> $SETUPFILE
-  echo "setPasswordC=1" >> $SETUPFILE
+  echo "setPasswordC=0" >> $SETUPFILE
 
 elif [ "${CHOICE}" == "OLD" ]; then
 
@@ -67,7 +67,7 @@ from your old node would be recommended.
         # when user wants to go back
         CHOICESUB=""
       else
-        # activate SEED input & SCB upload
+        # activate SEED input
         enterSEED=1
 
         # clear setup state from all fomer possible choices (previous loop)
@@ -78,7 +78,7 @@ from your old node would be recommended.
         # mark all passwords to be set at the end
         echo "setPasswordA=1" >> $SETUPFILE
         echo "setPasswordB=1" >> $SETUPFILE
-        echo "setPasswordC=1" >> $SETUPFILE
+        echo "setPasswordC=0" >> $SETUPFILE
 
       fi