Merge branch 'dev' of https://github.com/rootzoll/raspiblitz into dev

home.admin/_provision_.sh

@@ -294,7 +294,7 @@ if [ "${testnet}" == "on" ]; then
     sudo /home/admin/config.scripts/bitcoin.install.sh on testnet >> ${logFile} 2>&1
     sudo systemctl start tbitcoind >> ${logFile} 2>&1
 else
-    echo "Provisioning ${network} Testnet - not activ" >> ${logFile}
+    echo "Provisioning ${network} Testnet - not active" >> ${logFile}
 fi
 
 # Bitcoin Signet
@@ -303,7 +303,7 @@ if [ "${signet}" == "on" ]; then
     sudo /home/admin/config.scripts/bitcoin.install.sh on signet >> ${logFile} 2>&1
     sudo systemctl start sbitcoind >> ${logFile} 2>&1
 else
-    echo "Provisioning ${network} Signet - not activ" >> ${logFile}
+    echo "Provisioning ${network} Signet - not active" >> ${logFile}
 fi
 
 # LND Mainnet (when not main instance)
@@ -311,7 +311,7 @@ if [ "${lnd}" == "on" ] && [ "${lightning}" != "lnd" ]; then
     echo "Provisioning LND Mainnet - run config script" >> ${logFile}
     sudo /home/admin/config.scripts/lnd.install.sh on mainnet >> ${logFile} 2>&1
 else
-    echo "Provisioning LND Mainnet - not activ as secondary option" >> ${logFile}
+    echo "Provisioning LND Mainnet - not active as secondary option" >> ${logFile}
 fi
 
 # LND Testnet
@@ -320,7 +320,7 @@ if [ "${tlnd}" == "on" ]; then
     sudo /home/admin/config.scripts/lnd.install.sh on testnet >> ${logFile} 2>&1
     sudo systemctl start tlnd >> ${logFile} 2>&1
 else
-    echo "Provisioning LND Testnet - not activ" >> ${logFile}
+    echo "Provisioning LND Testnet - not active" >> ${logFile}
 fi
 
 # LND Signet
@@ -329,7 +329,7 @@ if [ "${slnd}" == "on" ]; then
     sudo /home/admin/config.scripts/lnd.install.sh on signet >> ${logFile} 2>&1
     sudo systemctl start slnd >> ${logFile} 2>&1
 else
-    echo "Provisioning LND Signet - not activ" >> ${logFile}
+    echo "Provisioning LND Signet - not active" >> ${logFile}
 fi
 
 # CLN Mainnet (when not main instance)
@@ -337,7 +337,7 @@ if [ "${cln}" == "on" ] && [ "${lightning}" != "cln" ]; then
     echo "Provisioning CLN Mainnet - run config script" >> ${logFile}
     sudo /home/admin/config.scripts/cln.install.sh on mainnet >> ${logFile} 2>&1
 else
-    echo "Provisioning CLN Mainnet - not activ as secondary option" >> ${logFile}
+    echo "Provisioning CLN Mainnet - not active as secondary option" >> ${logFile}
 fi
 
 # CLN Testnet
@@ -345,7 +345,7 @@ if [ "${tcln}" == "on" ]; then
     echo "Provisioning CLN Testnet - run config script" >> ${logFile}
     sudo /home/admin/config.scripts/cln.install.sh on testnet >> ${logFile} 2>&1
 else
-    echo "Provisioning CLN Testnet - not activ" >> ${logFile}
+    echo "Provisioning CLN Testnet - not active" >> ${logFile}
 fi
 
 # CLN Signet
@@ -353,7 +353,7 @@ if [ "${scln}" == "on" ]; then
     echo "Provisioning CLN Signet - run config script" >> ${logFile}
     sudo /home/admin/config.scripts/cln.install.sh on signet >> ${logFile} 2>&1
 else
-    echo "Provisioning CLN Signet - not activ" >> ${logFile}
+    echo "Provisioning CLN Signet - not active" >> ${logFile}
 fi
 
 # TOR

home.admin/config.scripts/cln.backup.sh

@@ -282,9 +282,8 @@ if [ ${mode} = "cln-import-gui" ]; then
   # check if encrypted
   trap 'rm -f "$output"' EXIT
   output=$(mktemp -p /dev/shm/)
-  echo "test" | sudo -u bitcoin \
+  echo "test" | sudo -u bitcoin lightning-hsmtool decrypt "$hsmSecretPath" \
-    /home/bitcoin/lightning/tools/hsmtool decrypt \
+   2> "$output"
-    "$hsmSecretPath" 2> "$output"
   if [ "$(grep -c "hsm_secret is not encrypted" < "$output")" -gt 0 ];then
     echo "# The hsm_secret is not encrypted"
     echo "# Record in raspiblitz.conf"

home.admin/config.scripts/cln.hsmtool.sh

@@ -113,15 +113,14 @@ function encryptHSMsecret() {
   if [ ${#walletPassword} -eq 0 ];then
     # ask for password in dialog if $walletPassword is not given in $3
     sudo /home/admin/config.scripts/blitz.setpassword.sh x \
-      "Enter the password to encrypt the C-lightning wallet file (hsm_secret)" \
+     "Enter the password to encrypt the C-lightning wallet file (hsm_secret)" \
-      "$passwordFile"
+     "$passwordFile"
     sudo chown bitcoin:bitcoin $passwordFile
     sudo chmod 600 $passwordFile
     walletPassword=$(sudo cat $passwordFile)
   fi  
-  (echo $walletPassword; echo $walletPassword) | sudo -u bitcoin \
+  (echo $walletPassword; echo $walletPassword) | \
-    /home/bitcoin/lightning/tools/hsmtool encrypt \
+   sudo -u bitcoin lightning-hsmtool encrypt $hsmSecretPath || exit 1
-    $hsmSecretPath || exit 1
   # setting value in raspiblitz.conf
   sudo sed -i \
     "s/^${netprefix}clnEncryptedHSM=.*/${netprefix}clnEncryptedHSM=on/g" \
@@ -134,9 +133,8 @@ function decryptHSMsecret() {
   # check if encrypted
   trap 'rm -f "$output"' EXIT
   output=$(mktemp -p /dev/shm/)
-  echo "test" | sudo -u bitcoin \
+  echo "test" | sudo -u bitcoin lightning-hsmtool decrypt "$hsmSecretPath" \
-    /home/bitcoin/lightning/tools/hsmtool decrypt \
+   2> "$output"
-    "$hsmSecretPath" 2> "$output"
   if [ "$(grep -c "hsm_secret is not encrypted" < "$output")" -gt 0 ];then
     echo "# The hsm_secret is not encrypted"
     shredPasswordFile
@@ -151,16 +149,14 @@ function decryptHSMsecret() {
     else
       passwordToFile
     fi
-    if sudo cat $passwordFile | sudo -u bitcoin \
+    if sudo cat $passwordFile | sudo -u bitcoin lightning-hsmtool decrypt \
-     /home/bitcoin/lightning/tools/hsmtool decrypt \
+     "$hsmSecretPath"; then
-     "$hsmSecretPath" ; then
       echo "# Decrypted successfully"
     else
       # unlock manually
       /home/admin/config.scripts/cln.hsmtool.sh unlock
       # attempt to decrypt again
-      sudo cat $passwordFile | sudo -u bitcoin \
+      sudo cat $passwordFile | sudo -u bitcoin lightning-hsmtool decrypt \
-       /home/bitcoin/lightning/tools/hsmtool decrypt \
        "$hsmSecretPath" || echo "# Couldn't decrypt"; exit 1
     fi
   fi
@@ -229,10 +225,12 @@ seedwords6x4='${seedwords6x4}'
 
   # pass to 'hsmtool generatehsm hsm_secret'
   if [ ${#seedpassword} -eq 0 ]; then
-    (echo "0"; echo "${seedwords}"; echo) | sudo -u bitcoin /home/bitcoin/lightning/tools/hsmtool "generatehsm" $hsmSecretPath 1>&2
+    (echo "0"; echo "${seedwords}"; echo) | sudo -u bitcoin lightning-hsmtool \
+     "generatehsm" $hsmSecretPath 1>&2
   else
     # pass to 'hsmtool generatehsm hsm_secret' - confirm seedPassword
-    (echo "0"; echo "${seedwords}"; echo "$seedpassword"; echo "$seedpassword") | sudo -u bitcoin /home/bitcoin/lightning/tools/hsmtool "generatehsm" $hsmSecretPath 1>&2
+    (echo "0"; echo "${seedwords}"; echo "$seedpassword"; echo "$seedpassword")\
+     | sudo -u bitcoin lightning-hsmtool "generatehsm" $hsmSecretPath 1>&2
   fi
 
   echo "# Re-init the backup plugin with the new wallet"