test image_size 31000

fix: add qrencode dependency check to cl-plugin.clnrest.sh

.github/workflows/amd64-fatpack-image.yml

@@ -76,9 +76,9 @@ jobs:
 
       - name: Run the build script
         run: |
-          echo "Using the variables: --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none"
+          echo "Using the variables: --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none --image_size 31000"
           cd ci/amd64
-          bash packer.build.amd64-debian.sh --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none
+          bash packer.build.amd64-debian.sh --pack fatpack --github_user ${{steps.set_values.outputs.GITHUB_USER}} --branch ${{env.BRANCH_NAME}} --preseed_file preseed.cfg --boot uefi --desktop none --image_size 31000
 
       - name: Compute checksum of the raw image
         run: |

CHANGES.md

@@ -1,18 +1,39 @@
-## What's new in Version 1.11.4 of RaspiBlitz?
+## What's new in Version 1.12.0 of RaspiBlitz?
 
-ReleaseCandidate: https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.4rc1-2024-12-18.img.gz 
+Work In Progress
+
+Features:
+
+- Update: RaspberryOS arm64 base image 2024-11-19 (Debian 12 Bookworm) [details](https://downloads.raspberrypi.com/raspios_full_arm64/release_notes.txt)
+- Update: amd64 base image: debian-12.8.0-amd64-netinst.iso [details](https://www.debian.org/releases/stable/amd64/release-notes/ch-whats-new.en.html)
+- Update: Specter Desktop 2.0.5 [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.5)
+- Update: Fulcrum Electrum server v1.11.1 (CLI install script with status menu) [details](https://github.com/cculianu/Fulcrum/releases/tag/v1.11.1)
+
+## What's new in Version 1.11.4 of RaspiBlitz?
 
 Small AlbyHub feature release with security/bug-fixing relevant updates.
 
 - New: AlbyHub v1.12.0 (SSH & WebUI) [details](https://github.com/getAlby)
-- New: SSH-Option to tirn on/off LNbits AdminUI [details](https://github.com/raspiblitz/raspiblitz/issues/4876)
+- New: SSH-Option to turn on/off LNbits AdminUI [details](https://github.com/raspiblitz/raspiblitz/issues/4876)
 - Update: LND v0.18.3-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.18.3-beta)
 - Update: Core Lightning v24.11 [details](https://github.com/ElementsProject/lightning/releases/tag/v24.11)
 
+Download RaspberryPi images:
+
+- Minimal:
+https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.4-2024-12-24.img.gz<br>
+SHA-256-Checksum: 3d874e8e2518bb9db79df196d1dd7e6d567a0608a3df568cadef87a77b4d3841
+
+- Fatpack:
+https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.11.4-2024-12-24.img.gz<br>
+SHA-256-Checksum: 31877d0085c20f34bf2bedeeec6bd4abc108595a4b0985d273ddaba2b0fbe654
+
 ## What's new in Version 1.11.3 of RaspiBlitz?
 
 Optimized now to run also on plain debian12 linux for Proxmox/VM & x86 systems.
 
+Containing Features:
+
 - New: Publicpool - Open Source Solo Bitcoin Mining (SSH Menu) [details](https://www.youtube.com/watch?v=QbOsH04Z9xM)
 - New: Tailscale (SSH menu > SETTINGS) [details](https://en.wikipedia.org/wiki/Tailscale)
 - New: Telegraf Metrics for InfluxDB/Grafana (SSH menu > SETTINGS) [details](https://github.com/raspiblitz/raspiblitz/tree/dev/home.admin/assets/telegraf/README.md)
@@ -30,6 +51,16 @@ Optimized now to run also on plain debian12 linux for Proxmox/VM & x86 systems.
 - Update: CLBOSS 0.13.3 [details](https://github.com/ZmnSCPxj/clboss/releases/tag/v0.13.3)
 - Update: Electrum Server in Rust (electrs) v0.10.6 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0106-sep-29-2024)
 
+Download RaspberryPi images:
+
+- Minimal:
+https://raspiblitz.fulmo.org/images/raspiblitz-min-v1.11.3-2024-11-03.img.gz<br>
+SHA-256-Checksum: 199fd4e671a49feb39420156031201c9118121d33ec6f9990fb9724de5be02c4
+
+- Fatpack:
+https://raspiblitz.fulmo.org/images/raspiblitz-fat-v1.11.3-2024-11-03.img.gz<br>
+SHA-256-Checksum: 65e523562768b21dcda85b96003c559a665015889402a3cea27638e6c5e290bd
+
 ## What's new in Version 1.11.2 of RaspiBlitz?
 
 This is just a quick patch release for v1.11.1

README.md

@@ -1,6 +1,6 @@
 # ![RaspiBlitz](pictures/raspilogo_tile_400px.png)
 
-_Build your own Bitcoin & Lightning Fullnode on a RaspberryPi with an optional Display._
+_Build your own Bitcoin & Lightning Fullnode on a RaspberryPi with an optional Display._ ([API](https://github.com/fusion44/blitz_api)|[WebUI](https://github.com/raspiblitz/raspiblitz-web))
 
 ![RaspiBlitz](pictures/raspiblitz.jpg)
 

build_sdcard.sh

@@ -329,8 +329,10 @@ isDebianInHosts=$(grep -c "debian" /etc/hosts)
 if [ ${isDebianInHosts} -eq 0 ]; then
   echo "# Adding debian to /etc/hosts"
   echo "127.0.1.1       debian" | tee -a /etc/hosts > /dev/null
+  if [ "${baseimage}" != "raspios_arm64" ]; then
     systemctl restart networking
   fi
+fi
 
 echo "*** Remove unnecessary packages ***"
 unnecessary_packages=(libreoffice* oracle-java* chromium-browser nuscratch scratch sonic-pi plymouth python2 vlc* cups)

ci/amd64/debian/build.amd64-debian.pkr.hcl

@@ -1,5 +1,5 @@
-variable "iso_name" { default = "debian-12.7.0-amd64-netinst.iso" }
+variable "iso_name" { default = "debian-12.9.0-amd64-netinst.iso" }
-variable "iso_checksum" { default = "8fde79cfc6b20a696200fc5c15219cf6d721e8feb367e9e0e33a79d1cb68fa83" }
+variable "iso_checksum" { default = "1257373c706d8c07e6917942736a865dfff557d21d76ea3040bb1039eb72a054" }
 
 variable "pack" { default = "lean" }
 variable "github_user" { default = "raspiblitz" }
@@ -10,7 +10,7 @@ variable "boot" { default = "uefi" }
 variable "preseed_file" { default = "preseed.cfg" }
 variable "hostname" { default = "raspiblitz-amd64" }
 
-variable "disk_size" { default = "30000" }
+variable "image_size" { default = "27000" }
 variable "memory" { default = "4096" }
 variable "cpus" { default = "4" }
 
@@ -51,7 +51,7 @@ source "qemu" "debian" {
   boot_command     = local.boot_command
   boot_wait        = "5s"
   cpus             = var.cpus
-  disk_size        = var.disk_size
+  disk_size        = var.image_size
   http_directory   = "./http"
   iso_checksum     = var.iso_checksum
   iso_url          = "https://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/${var.iso_name}"

ci/arm64-rpi/build.arm64-rpi.pkr.hcl

@@ -1,8 +1,8 @@
 variable "pack" { default = "lean" }
 variable "github_user" { default = "raspiblitz" }
 variable "branch" { default = "dev" }
-variable "image_link" { default = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2024-03-15/2024-03-15-raspios-bookworm-arm64.img.xz" }
+variable "image_link" { default = "https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2024-11-19/2024-11-19-raspios-bookworm-arm64.img.xz" }
-variable "image_checksum" { default = "7e53a46aab92051d523d7283c080532bebb52ce86758629bf1951be9b4b0560f" }
+variable "image_checksum" { default = "ea6e68c48d14c3d78af5471c0b288bbf6522fdd775241f74d8295d106d344300" }
 variable "image_size" { default = "24G" }
 
 source "arm" "raspiblitz-arm64-rpi" {

home.admin/BBcloseAllChannels.sh

@@ -3,111 +3,42 @@
 # load raspiblitz config data (with backup from old config)
 source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
-if [ ${#network} -eq 0 ]; then network=$(cat .network); fi
+if [ ${#network} -eq 0 ]; then network=`cat .network`; fi
 if [ ${#network} -eq 0 ]; then network="bitcoin"; fi
 if [ ${#chain} -eq 0 ]; then
   chain=$(${network}-cli getblockchaininfo | jq -r '.chain')
 fi
 
-source <(/home/admin/config.scripts/network.aliases.sh getvars $1 $2)
-
-if [ $LNTYPE = cl ];then
-  # https://lightning.readthedocs.io/lightning-close.7.html
-  peerlist=$($lightningcli_alias listpeers|grep '"id":'|awk '{print $2}'|cut -d, -f1)
-  # to display
-  function cl_closeall_command {
-    for i in $peerlist; do
-      # close id [unilateraltimeout] [destination] [fee_negotiation_step] [*wrong_funding*]
-      echo "$lightningcli_alias close $i 30;"
-    done
-  }
-  command=$(cl_closeall_command)
-  # to run
-  function cl_closeall {
-    for i in $peerlist; do
-      # close id [unilateraltimeout] [destination] [fee_negotiation_step] [*wrong_funding*]
-      echo "# Attempting a mutual close one-by-one with a 30 seconds timeout"
-      $lightningcli_alias close $i 30
-    done
-  }
-elif [ $LNTYPE = lnd ];then
 # precheck: AutoPilot
 if [ "${autoPilot}" = "on" ]; then
   dialog --title 'Info' --msgbox 'You need to turn OFF the LND AutoPilot first,\nso that closed channels are not opening up again.\nYou find the AutoPilot -----> SERVICES section' 7 55
-    exit 0
-  fi
-  
-  # User choice for close type
-  close_type=$(dialog --clear \
-    --title "LND Channel Close Type" \
-    --menu "Choose how to close channels:" \
-    14 54 3 \
-    "COOP" "Attempt Cooperative Close" \
-    "FORCE" "Force Close Channels" \
-    2>&1 >/dev/tty)
-
-  # Set command based on user choice
-  if [ "$close_type" = "COOP" ]; then
-    command="$lncli_alias closeallchannels"
-  elif [ "$close_type" = "FORCE" ]; then
-    command="$lncli_alias closeallchannels --force"
-  else
-    echo "Invalid choice. Exiting."
   exit 1
 fi
-fi
+
+command="lncli --chain=${network} --network=${chain}net closeallchannels --force"
 
 clear
-echo
+echo "***********************************"
-echo "# Precheck" # PRECHECK) check if chain is in sync
+echo "Closing All Channels (EXPERIMENTAL)"
-if [ $LNTYPE = cl ];then
+echo "***********************************"
-  BLOCKHEIGHT=$($bitcoincli_alias getblockchaininfo|grep blocks|awk '{print $2}'|cut -d, -f1)
+echo ""
-  CLHEIGHT=$($lightningcli_alias getinfo | jq .blockheight)
+echo "COMMAND LINE: "
-  if [ $BLOCKHEIGHT -eq $CLHEIGHT ];then
-    chainOutSync=0
-  else
-    chainOutSync=1
-  fi
-elif [ $LNTYPE = lnd ];then
-  chainOutSync=$($lncli_alias getinfo | grep '"synced_to_chain": false' -c)
-fi
-if [ ${chainOutSync} -eq 1 ]; then
-  if [ $LNTYPE = cl ];then
-    echo "# FAIL PRECHECK - '${netprefix}lightning-cli getinfo' blockheight is different from '${netprefix}bitcoind getblockchaininfo' - wait until chain is sync "
-  elif [ $LNTYPE = lnd ];then
-    echo "# FAIL PRECHECK - ${netprefix}lncli getinfo shows 'synced_to_chain': false - wait until chain is sync "  
-  fi
-  echo 
-  echo "# PRESS ENTER to return to menu"
-  read key
-  exit 0
-else
-  echo "# OK - the chain is synced"
-fi
-
-# raise high focus on lightning channels next 1 hour
-/home/admin/_cache.sh focus ln_${LNTYPE}_${CHAIN}_channels_active 0 3600
-/home/admin/_cache.sh focus ln_${LNTYPE}_${CHAIN}_channels_inactive 0 3600
-/home/admin/_cache.sh focus ln_${LNTYPE}_${CHAIN}_channels_total 0 3600
-
-echo "#####################################"
-echo "# Closing All Channels (EXPERIMENTAL)"
-echo "#####################################"
-echo 
-echo "# COMMAND LINE: "
 echo $command
-echo 
+echo ""
-echo "# RESULT:"
+echo "RESULT:"
+
+# PRECHECK) check if chain is in sync
+chainInSync=$(lncli --chain=${network} --network=${chain}net getinfo | grep '"synced_to_chain": true' -c)
+if [ ${chainInSync} -eq 0 ]; then
+  command=""
+  result="FAIL PRECHECK - lncli getinfo shows 'synced_to_chain': false - wait until chain is sync "
+fi
 
 # execute command
 if [ ${#command} -gt 0 ]; then
-  if [ $LNTYPE = cl ];then
-    cl_closeall
-  elif [ $LNTYPE = lnd ];then
   ${command}
 fi
-fi
  
-echo
+echo ""
-echo "# OK - please recheck if channels really closed"
+echo "OK - please recheck if channels really closed"
 sleep 5

home.admin/config.scripts/bonus.fulcrum.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # https://github.com/cculianu/Fulcrum/releases
-fulcrumVersion="1.10.0"
+fulcrumVersion="1.11.1"
 
 portTCP="50021"
 portSSL="50022"

home.admin/config.scripts/bonus.lnbits.sh

@@ -234,6 +234,16 @@ Consider adding a IP2TOR Bridge under OPTIONS."
     OPTIONS+=(ADMINUI "Deactivate 'Admin UI'")
   fi
 
+  # Allow New Accounts (only if AdminUI is OFF)
+  allowNewAccountsFalse=$(sudo grep -c "LNBITS_ALLOW_NEW_ACCOUNTS=false" $lnbitsConfig)
+  if [ ${activatedAdminUI} -eq 0 ]; then
+    if [ ${allowNewAccountsFalse} -eq 0 ]; then
+      OPTIONS+=(NEWACCOUNTS "Disable New Accounts")
+    else
+      OPTIONS+=(NEWACCOUNTS "Enable New Accounts")
+    fi
+  fi
+
   WIDTH=66
   CHOICE_HEIGHT=$(("${#OPTIONS[@]}/2+1"))
   HEIGHT=$((CHOICE_HEIGHT + 7))
@@ -306,7 +316,27 @@ Consider adding a IP2TOR Bridge under OPTIONS."
       sudo sed -i "/^LNBITS_ADMIN_UI=/d" $lnbitsConfig
       sudo bash -c "echo 'LNBITS_ADMIN_UI=false' >> ${lnbitsConfig}"
     fi
-    echo "Restarting LNbits ..."
+    echo "Restarting LNbits to activate new setting ..."
+    sudo systemctl restart lnbits
+    echo "PRESS ENTER to continue"
+    read key
+    exit 0
+    ;;
+  NEWACCOUNTS)
+    clear
+    echo
+    if [ ${allowNewAccountsFalse} -eq 0 ]; then
+      echo "Disable New Accounts"
+      sudo sed -i "/^LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
+      sudo sed -i "/^# LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
+      sudo bash -c "echo 'LNBITS_ALLOW_NEW_ACCOUNTS=false' >> ${lnbitsConfig}"
+    else
+      echo "Enable New Accounts"
+      sudo sed -i "/^LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
+      sudo sed -i "/^# LNBITS_ALLOW_NEW_ACCOUNTS=/d" $lnbitsConfig
+      sudo bash -c "echo 'LNBITS_ALLOW_NEW_ACCOUNTS=true' >> ${lnbitsConfig}"
+    fi
+    echo "Restarting LNbits to activate new setting ..."
     sudo systemctl restart lnbits
     echo "PRESS ENTER to continue"
     read key

home.admin/config.scripts/bonus.mempool.sh

@@ -202,11 +202,20 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   if [ "${isInstalled}" == "0" ]; then
     echo "# Install code base first ...."
     if ! /home/admin/config.scripts/bonus.mempool.sh install; then
+      /home/admin/config.scripts/bonus.mempool.sh uninstall 2>/dev/null
       echo "FAIL - install did not run correctly, aborting"
       exit 1
     fi
   fi
 
+  # check if /home/mempool/mempool exists
+  if [ ! -d "/home/mempool/mempool" ]; then
+    /home/admin/config.scripts/bonus.mempool.sh uninstall 2>/dev/null
+    echo "error='mempool code base install failed'"
+    echo "# please run manually first: /home/admin/config.scripts/bonus.mempool.sh install"
+    exit 1
+  fi
+
   echo "# *** Activate MEMPOOL ***"
 
   # make sure mariadb is running
@@ -233,6 +242,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     RPC_USER=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcuser | cut -c 9-)
     PASSWORD_B=$(sudo cat /mnt/hdd/${network}/${network}.conf | grep rpcpassword | cut -c 13-)
 
+    sudo rm /var/cache/raspiblitz/mempool-config.json 2>/dev/null
     touch /var/cache/raspiblitz/mempool-config.json
     chmod 600 /var/cache/raspiblitz/mempool-config.json || exit 1
     cat >/var/cache/raspiblitz/mempool-config.json <<EOF

home.admin/config.scripts/bonus.postgresql.sh

@@ -35,6 +35,12 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
     sudo apt install -y postgresql-$PG_VERSION
   fi
 
+  # make sure en_GB locale is available for now - see #4893
+  echo "# temp fixing locale"
+  sudo sed -i '/^#en_GB.UTF-8 UTF-8/s/^#//' /etc/locale.gen
+  sudo sed -i '/^# en_GB.UTF-8 UTF-8/s/^# //' /etc/locale.gen
+  sudo locale-gen
+
   postgres_datadir="/var/lib/postgresql" # default data dir
   postgres_confdir="/etc/postgresql"     # default conf dir
 
@@ -62,7 +68,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
     sudo chown -R postgres:postgres $postgres_datadir
 
     echo "# Create cluster"
-    sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
+    sudo pg_createcluster $PG_VERSION main
     sudo pg_ctlcluster $PG_VERSION main start
 
   elif [ -d /mnt/hdd/app-data/postgresql/$PG_VERSION/main ]; then
@@ -79,12 +85,12 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
       echo "# Create $PG_VERSION config"
       sudo mkdir -p $postgres_datadir/$PG_VERSION/main
       sudo chown -R postgres:postgres $postgres_datadir
-      sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
+      sudo pg_createcluster $PG_VERSION main
       sudo pg_ctlcluster $PG_VERSION main start
       echo "Setting default password for postgres user"
       # start cluster temporarily
       sudo systemctl start postgresql
-      sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
+      sudo pg_createcluster $PG_VERSION main
       sudo pg_ctlcluster $PG_VERSION main start
       echo "Setting default password for postgres user"
       sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres';"
@@ -108,7 +114,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
     sudo chown -R postgres:postgres $postgres_datadir
     sudo systemctl start postgresql
     sudo systemctl start postgresql@13-main
-    sudo pg_createcluster --locale en_US.UTF-8 $PG_VERSION main
+    sudo pg_createcluster $PG_VERSION main
     sudo pg_ctlcluster $PG_VERSION main start
 
   elif [ -d /mnt/hdd/app-data/postgresql/13/main ]; then
@@ -130,7 +136,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
       sudo chown -R postgres:postgres $postgres_datadir
       # start cluster temporarily
       sudo systemctl start postgresql
-      sudo pg_createcluster --locale en_US.UTF-8 13 main
+      sudo pg_createcluster 13 main
       sudo pg_ctlcluster 13 main start
       echo "# Setting default password for postgres user"
       sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD 'postgres';"
@@ -154,7 +160,7 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
     sudo chown -R postgres:postgres $postgres_datadir
     sudo systemctl start postgresql
     sudo systemctl start postgresql@13-main
-    sudo pg_createcluster --locale en_US.UTF-8 13 main
+    sudo pg_createcluster 13 main
     sudo pg_ctlcluster 13 main start
 
     if [ -d /mnt/hdd/app-data/postgresql/$PG_VERSION ] || pg_lsclusters | grep -q "$PG_VERSION  main"; then
@@ -185,24 +191,6 @@ if [ "$command" = "1" ] || [ "$command" = "on" ]; then
     fi
   fi
 
-  # Setting PostgreSQL locale settings
-  LOCALE_SETTINGS=(
-    "lc_messages = 'en_US.UTF-8'"
-    "lc_monetary = 'en_US.UTF-8'"
-    "lc_numeric = 'en_US.UTF-8'"
-    "lc_time = 'en_US.UTF-8'"
-  )
-  for setting in "${LOCALE_SETTINGS[@]}"; do
-    key=$(echo "$setting" | cut -d= -f1 | tr -d ' ')
-    if ! sudo grep -q "^${key}" /etc/postgresql/$PG_VERSION/main/postgresql.conf; then
-      echo "# Adding $setting"
-      echo "$setting" | sudo tee -a /etc/postgresql/$PG_VERSION/main/postgresql.conf
-    else
-      echo "# Updating $setting"
-      sudo sed -i "s|^${key}.*|${setting}|" /etc/postgresql/$PG_VERSION/main/postgresql.conf
-    fi
-  done
-  
   # start cluster
   sudo systemctl enable postgresql
   sudo systemctl start postgresql

home.admin/config.scripts/bonus.specter.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # https://github.com/cryptoadvance/specter-desktop
 
-pinnedVersion="2.0.4"
+pinnedVersion="2.0.5"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then

home.admin/config.scripts/cl-plugin.clnrest.sh

@@ -11,6 +11,12 @@ fi
 # check and load raspiblitz config to know which network is running
 source /mnt/hdd/raspiblitz.conf
 
+# check and install qrencode if not present
+if [ $(dpkg-query -l | grep "ii  qrencode" | wc -l) = 0 ]; then
+  echo "# Installing qrencode..."
+  sudo apt-get install -y qrencode >/dev/null 2>&1
+fi
+
 echo "# Running: 'cl-plugin.clnrest.sh $*'"
 
 source <(/home/admin/config.scripts/network.aliases.sh getvars cl $2)

home.admin/config.scripts/cl.install-service.sh

@@ -60,16 +60,14 @@ ExecStartPost=-/home/admin/config.scripts/cl.check.sh poststart $CHAIN
 
 # Creates /run/lightningd owned by bitcoin
 RuntimeDirectory=lightningd
-
 User=bitcoin
 Group=bitcoin
 # Type=forking hangs on restart
 Type=simple
 PIDFile=/run/lightningd/${netprefix}lightningd.pid
-Restart=on-failure
+Restart=always
-
+RestartSec=60
 TimeoutSec=240
-RestartSec=30
 StandardOutput=null
 StandardError=journal
 

home.admin/config.scripts/cl.install.sh

@@ -162,7 +162,7 @@ if [ "$1" = "install" ]; then
     exit 1
   fi
   echo
-  echo "- OK the installation of Core Lightning v${installed} is successful"
+  echo "- OK the installation of Core Lightning ${installed} is successful"
   exit 0
 fi
 

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

@@ -259,6 +259,19 @@ if [ "$2" = "wallet" ]; then
     exit 1
   fi
 
+  ln_pendingbalance=$($lndcli_alias pendingchannels 2>/dev/null)
+  if [ "${ln_pendingbalance}" == "" ]; then
+    echo "error='no data'"
+    exit 1
+  fi  
+
+  ln_pendingonchainbalance_sum=$(echo "${ln_pendingbalance}" | jq -r '
+  ([ .pending_force_closing_channels[].channel.local_balance,
+     .pending_closing_channels[].channel.local_balance
+   ] | map(tonumber) | add // 0)')
+
+  lnd_wallet_onchain_pending=$(( ${lnd_wallet_onchain_pending:-0} + ${ln_pendingonchainbalance_sum:-0} ))
+
    # parse data
   lnd_wallet_channels_balance=$(echo "$ln_channelbalance" | jq -r '.balance')
   lnd_wallet_channels_pending=$(echo "$ln_channelbalance" | jq -r '.pending_open_balance')

home.admin/config.scripts/tor.network.sh

@@ -167,6 +167,9 @@ EOF
     # setting value in raspi blitz config
     /home/admin/config.scripts/blitz.conf.sh set runBehindTor "off"
 
+    # remove "debug=tor" from bitcoin.conf
+    sudo sed -i '/^debug=tor$/d' /mnt/hdd/bitcoin/bitcoin.conf
+
     # deactivate bitcoin over tor (function call)
     deactivateBitcoinOverTor
     echo