Merge pull request #3843 from rootzoll/3831lit

#3831 quick fix for LITD macaroon renew

CHANGES.md

@@ -17,7 +17,7 @@
 - Update: Core Lightning v23.02.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v23.02.2)
 - Update: C-lightningREST v0.10.2 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.10.2)
 - Update: Electrum Server in Rust (electrs) v0.9.11 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0911-jan-5-2023)
-- Update: Lightning Terminal v0.8.6-alpha [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.8.6-alpha)
+- Update: Lightning Terminal v0.9.2-alpha [details](https://github.com/lightninglabs/lightning-terminal/releases/tag/v0.9.2-alpha)
 - Update: RTL v0.13.6 with update option [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.13.6)
 - Update: Thunderhub v0.13.16 with balance sharing disabled [details](https://github.com/apotdevin/thunderhub/releases/tag/v0.13.16)
 - Update: LNbits 0.10.6 [details](https://github.com/lnbits/lnbits/releases/tag/0.10.6)

home.admin/99connectMenu.sh

@@ -65,7 +65,6 @@ case $CHOICE in
     exit 0;;
   RESET)
     sudo /home/admin/config.scripts/lnd.credentials.sh reset "${chain:-main}net"
-    sudo /home/admin/config.scripts/lnd.credentials.sh sync "${chain:-main}net"
     sudo /home/admin/config.scripts/blitz.shutdown.sh reboot
     exit 0;;
   SYNC)

home.admin/config.scripts/lnd.credentials.sh

@@ -92,6 +92,9 @@ if [ "$1" = "reset" ]; then
     if [ "${keepOldMacaroons}" != "1" ]; then
       sudo rm /home/bitcoin/.lnd/data/chain/"${network}"/"${chain}"net/macaroons.db
     fi
+
+    echo "# delete also lit macaroons if present"
+    sudo rm /mnt/hdd/app-data/.lit/mainnet/lit.macaroon 2>/dev/null
   fi
 
   if [ ${resetTLS} -eq 1 ]; then
@@ -105,11 +108,11 @@ if [ "$1" = "reset" ]; then
   echo "# restarting LND ... wait 10 secs"
   # shellcheck disable=SC2154
   sudo systemctl start "${netprefix}lnd"
-  sleep 10
+  sleep 20
 
   # unlock wallet after restart
   sudo /home/admin/config.scripts/lnd.unlock.sh "${CHAIN}"
-  sleep 10
+  sleep 15
 
   if [ ${resetMacaroons} -eq 1 ]; then
     echo "# copy new macaroons to central app-data directory and ensure unix ownerships and permissions"
@@ -121,6 +124,9 @@ if [ "$1" = "reset" ]; then
 
   /home/admin/config.scripts/lnd.credentials.sh sync "${CHAIN}"
 
+  echo "# restart also litd if present (reboot advised)"
+  sudo systemctl restart litd 2>/dev/null
+
 ###########################
 # SYNC
 ###########################

home.admin/config.scripts/lnd.tlscert.sh

@@ -176,8 +176,8 @@ if [ "$1" = "refresh" ]; then
   while [ ${newCertExists} -eq 0 ]
   do
     count=$(($count + 1))
-    echo "# (${count}/60) check for cert"
-    if [ ${count} -gt 60 ]; then
+    echo "# (${count}/120) check for cert"
+    if [ ${count} -gt 120 ]; then
       sudo systemctl stop lnd
       echo "error='failed to generate new LND cert'"
       exit 1