Merge pull request #4489 from raspiblitz/dev

Merge dev for v1.11.0rc5

CHANGES.md

@@ -4,14 +4,14 @@
 - New: BTCPay Server PostgreSQL database backup and restore options [details](https://github.com/raspiblitz/raspiblitz/pull/4409)
 - New: Reset option for the self-signed TLS certificate [details](https://github.com/raspiblitz/raspiblitz/pull/4412)
 - New on WebUI: Electrum Connect Screen
-- Update: RaspberryOS base image 2023-12-05 (Debian 12 Bookworm)
+- Update: RaspberryOS arm64 base image 2024-03-15 (Debian 12 Bookworm) [details](https://downloads.raspberrypi.com/raspios_full_arm64/release_notes.txt)
 - Update: amd64 base image: debian-12.5.0-amd64-netinst.iso
 - Update: Bitcoin Core v26.0 [details](https://bitcoincore.org/en/releases/26.0/)
 - Update: LND v0.17.3-beta [details](https://github.com/lightningnetwork/lnd/releases/tag/v0.17.3-beta)
-- Update: Core Lightning v23.11.2 [details](https://github.com/ElementsProject/lightning/releases/tag/v23.11.2)
+- Update: Core Lightning v24.02.1 [details](https://github.com/ElementsProject/lightning/releases/tag/v24.02.1)
 - Update: C-lightningREST v0.10.7 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.10.7)
-- Update: Electrum Server in Rust (electrs) v0.10.2 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0102-dec-31-2023)
+- Update: Electrum Server in Rust (electrs) v0.10.4 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#0104-mar-15-2024)
-- Update: Fulcrum Electrum server v1.9.8 (CLI install script) [details](https://github.com/cculianu/Fulcrum/releases/tag/v1.9.8)
+- Update: Fulcrum Electrum server v1.10.0 (CLI install script) [details](https://github.com/cculianu/Fulcrum/releases/tag/v1.10.0)
 - Update: BTC-RPC-Explorer v3.4.0 [details](https://github.com/janoside/btc-rpc-explorer/blob/master/CHANGELOG.md#v340)
 - Update: JoinMarket v0.9.11 [details](https://github.com/JoinMarket-Org/joinmarket-clientserver/releases/tag/v0.9.11)
 - Update: Jam (JoinMarket Web UI) v0.2.0 [details](https://github.com/joinmarket-webui/jam/releases/tag/v0.2.0)
@@ -27,6 +27,7 @@
 - Fix: PyBlock 2.2.3 [details](https://github.com/curly60e/pyblock/blob/master/README.md)
 - Refactor: Wifi config with file on sd card
 - Deactivated for Repair: LNDg [details](https://github.com/raspiblitz/raspiblitz/issues/4418)
+- Deactivated for Repair: lnproxy [details](https://github.com/raspiblitz/raspiblitz/issues/4122)
 - Deprecated: Homer Dashboard (remove from SSH menus, config script will stay with possible future removal)
 - Deprecated: Bitcoinminds (remove from SSH menus, config script will stay with possible future removal)
 - Remove: ItchySats (unmaintained project / in consent with dev)

FAQ.dev.md

@@ -218,6 +218,10 @@ Now to sync your branch namend BRANCH on your forked repo with your RaspiBlitz,
 
 So your workflow can go like this: You write code on your local computer. Commit to your local repo, push it to your forked repo and use the sync-script above to get the code to your RaspiBlitz.
 
+### How can I manual provision an image with updated code?
+
+To boot an already build sd card image with your updated raspiblitz code base you can use the `stop` file flag. This will make the `_bootstrap.sh` script stop basically before making any setup or recovery changes to the system. You can SSH in an use the `github` command to update the raspiblitz code and then use `release` command. To set the `stop` file flag. Insert a fresh written sd card into your PC and on the root of `bootfs` drive with a file manager place a empty file simply called `stop` (with no file extension).
+
 ### How to add an app to the RaspiBlitz?
 
 To add your app you can fork the raspiblitz repo, follow the `/home.admin/config.scripts/bonus.template.sh` script [see code](https://github.com/raspiblitz/raspiblitz/blob/dev/home.admin/config.scripts/bonus.template.sh), copy/adapt it, test it on your RaspiBlitz and make a PR back to the main repo.

build_sdcard.sh

@@ -2,8 +2,8 @@
 
 #########################################################################
 # Build your SD card image based on: 2023-12-05-raspios-bookworm-arm64.img.xz
-# https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2023-12-06/
+# https://downloads.raspberrypi.org/raspios_arm64/images/raspios_arm64-2024-03-15/
-# SHA256: 5c54f0572d61e443a32dfa80aa8d918049814bfc70ab977f2d545eef45f1658e
+# SHA256: 7e53a46aab92051d523d7283c080532bebb52ce86758629bf1951be9b4b0560f
 # also change in: raspiblitz/ci/arm64-rpi/build.arm64-rpi.pkr.hcl
 # PGP fingerprint: 8738CD6B956F460C - to check signature:
 # curl -O https://www.raspberrypi.org/raspberrypi_downloads.gpg.key && gpg --import ./raspberrypi_downloads.gpg.key && gpg --verify *.sig

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-2023-12-06/2023-12-05-raspios-bookworm-arm64.img.xz" }
+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_checksum" { default = "5c54f0572d61e443a32dfa80aa8d918049814bfc70ab977f2d545eef45f1658e" }
+variable "image_checksum" { default = "7e53a46aab92051d523d7283c080532bebb52ce86758629bf1951be9b4b0560f" }
 
 source "arm" "raspiblitz-arm64-rpi" {
   file_checksum_type    = "sha256"

ci/arm64-rpi/build.raspiblitz.sh

@@ -5,12 +5,14 @@ wget https://raw.githubusercontent.com/${github_user}/raspiblitz/${branch}/build
 
 if [ "${pack}" = "fatpack" ]; then
   fatpack="1"
+  display="lcd"
 else
   fatpack="0"
+  display="headless"
 fi
 
 # make /dev/shm world writable for qemu
 sudo chmod 777 /dev/shm
 
 echo 'Build RaspiBlitz ...'
-bash build_sdcard.sh -f ${fatpack} -u ${github_user} -b ${branch} -t false -w off -i false
+bash build_sdcard.sh -f ${fatpack} -u ${github_user} -b ${branch} -t false -w off -i false -d ${display}

ci/packer.sh

@@ -126,15 +126,15 @@ echo "# Date: ${dateString}"
 if [ "${ARCH}" == "arm" ] && [ "${TYPE}" == "min" ]; then
   PACKERTARGET="arm64-rpi-lean-image"
   PACKERBUILDPATH="./raspiblitz/ci/arm64-rpi/packer-builder-arm/raspiblitz-arm64-rpi-lean.img"
-  PACKERFINALFILE="raspiblitz-min-${codeVersion}-${dateString}.img"
+  PACKERFINALFILE="raspiblitz-min-v${codeVersion}-${dateString}.img"
 elif [ "${ARCH}" == "arm" ] && [ "${TYPE}" == "fat" ]; then
   PACKERTARGET="arm64-rpi-fatpack-image" 
   PACKERBUILDPATH="./raspiblitz/ci/arm64-rpi/packer-builder-arm/TODO" #TODO
-  PACKERFINALFILE="raspiblitz-fat-${codeVersion}-${dateString}.img"
+  PACKERFINALFILE="raspiblitz-fat-v${codeVersion}-${dateString}.img"
 elif [ "${ARCH}" == "x86" ] && [ "${TYPE}" == "min" ]; then
   PACKERTARGET="amd64-lean-server-legacyboot-image"
   PACKERBUILDPATH="./raspiblitz/ci/amd64/builds/raspiblitz-amd64-debian-lean-qemu/raspiblitz-amd64-debian-lean.qcow2"
-  PACKERFINALFILE="raspiblitz-amd64-min-${codeVersion}-${dateString}.qcow2"
+  PACKERFINALFILE="raspiblitz-amd64-min-v${codeVersion}-${dateString}.qcow2"
 else
   echo "error='$ARCH-$TYPE not supported'"
   exit 1

home.admin/00infoLCD.sh

@@ -86,7 +86,6 @@ while :
 
     # get config info if already available (with state value)
     source ${infoFile}
-    source <(/home/admin/_cache.sh get state message)
 
     configExists=$(ls "${configFile}" 2>/dev/null | grep -c '.conf')
     if [ ${configExists} -eq 1 ]; then

home.admin/00raspiblitz.sh

@@ -13,7 +13,6 @@ source /mnt/hdd/raspiblitz.conf 2>/dev/null
 # INFOFILE - state data from bootstrap
 infoFile="/home/admin/raspiblitz.info"
 source ${infoFile}
-source <(/home/admin/_cache.sh get state message)
 
 # check that basic system phase/state information is available
 if [ "${setupPhase}" == "" ] || [ "${state}" == "" ]; then

home.admin/_background.sh

@@ -43,7 +43,6 @@ do
   # source info & config file fresh on every loop
   source ${infoFile} 2>/dev/null
   source ${configFile} 2>/dev/null
-  source <(/home/admin/_cache.sh get state setupPhase)
 
   ####################################################
   # SKIP BACKGROUND TASK LOOP ON CERTAIN SYSTEM STATES

home.admin/_bootstrap.sh

@@ -90,15 +90,16 @@ ln_cl_signet_sync_initial_done=0
 source ${infoFile} 2>/dev/null
 
 # write fresh raspiblitz.info file
-echo "baseimage=${baseimage}" > $infoFile
+echo "state=starting" > $infoFile
+echo "message=starting" >> $infoFile
+echo "setupPhase=${setupPhase}" >> $infoFile
+echo "setupStep=${setupStep}" >> $infoFile
+echo "baseimage=${baseimage}" >> $infoFile
 echo "cpu=${cpu}" >> $infoFile
 echo "blitzapi=${blitzapi}" >> $infoFile
 echo "displayClass=${displayClass}" >> $infoFile
 echo "displayType=${displayType}" >> $infoFile
-echo "setupPhase=${setupPhase}" >> $infoFile
-echo "setupStep=${setupStep}" >> $infoFile
 echo "fsexpanded=${fsexpanded}" >> $infoFile
-echo "state=starting" >> $infoFile
 echo "btc_mainnet_sync_initial_done=${btc_mainnet_sync_initial_done}" >> $infoFile
 echo "btc_testnet_sync_initial_done=${btc_testnet_sync_initial_done}" >> $infoFile
 echo "btc_signet_sync_initial_done=${btc_signet_sync_initial_done}" >> $infoFile
@@ -114,6 +115,22 @@ chmod 664 ${infoFile}
 # write content of raspiblitz.info to logs
 cat $infoFile >> $logFile
 
+######################################
+# STOP file flag - for manual provision
+
+# when a file 'stop' is on the sd card bootfs partition root - stop for manual provision
+flagExists=$(ls /boot/firmware/stop | grep -c 'stop')
+if [ "${flagExists}" == "1" ]; then
+  # remove flag
+  rm /boot/firmware/stop
+  # set state info
+  /home/admin/_cache.sh set state "stop"
+  /home/admin/_cache.sh set message "stopped for manual provision"
+  # log info
+  echo "INFO: 'bootstrap stopped - run release after manual provison'" >> ${logFile}
+  exit 0
+fi
+
 #########################
 # INIT RaspiBlitz Cache
 #########################
@@ -155,16 +172,6 @@ source ${configFile} 2>/dev/null
 ######################################
 # CHECK SD CARD STATE
 
-# when a file 'stop' is on the sd card bootfs partition root - stop for manual provision
-flagExists=$(ls /boot/firmware/stop | grep -c 'stop')
-if [ "${flagExists}" == "1" ]; then
-  # remove flag
-  rm /boot/firmware/stop
-  # log info
-  echo "INFO: 'bootstrap stopped - run release after manual provison'" >> ${logFile}
-  exit 0
-fi
-
 # wifi config by file on sd card
 wifiFileExists=$(ls /boot/firmware/wifi | grep -c 'wifi')
 wpaFileExists=$(ls /boot/firmware/wpa_supplicant.conf | grep -c 'wpa_supplicant.conf')

home.admin/_cache.sh

@@ -148,6 +148,23 @@ elif [ "$1" = "set" ] || [ "$1" = "init" ]; then
     exit 1
   fi
 
+  # update certain values also in raspiblitz.info
+  if [ "${keystr}" = "state" ]; then
+    # change value in raspiblitz.info
+    sudo sed -i "s/^state=.*/state='${valuestr}'/g" ${infoFile}
+  fi
+  if [ "${keystr}" = "message" ]; then
+    # change value in raspiblitz.info
+    sudo sed -i "s/^message=.*/message='${valuestr}'/g" ${infoFile}
+  fi
+  if [ "${keystr}" = "setupPhase" ]; then
+    # change value in raspiblitz.info
+    sudo sed -i "s/^setupPhase=.*/setupPhase='${valuestr}'/g" ${infoFile}
+  fi
+  if [ "${keystr}" = "setupStep" ]; then
+    # change value in raspiblitz.info
+    sudo sed -i "s/^setupStep=.*/setupStep='${valuestr}'/g" ${infoFile}
+  fi 
 
   NX=""
   if [ "$1" = "init" ]; then

home.admin/_provision_.sh

@@ -183,21 +183,25 @@ sed -i "s/^setupStep=.*/setupStep=100/g" /home/admin/raspiblitz.info
 ##########################
 # PROVISIONING SERVICES
 ##########################
+
+echo "### CHECKING BLITZ-API/FRONT STATUS ###" >> ${logFile}
+blitzApiInstalled=$(systemctl status blitzapi | grep -c "loaded")
+echo "# blitzapi(${blitzapi}) blitzApiInstalled(${blitzApiInstalled})"
+if [ "${blitzapi}" != "on" ] && [ ${blitzApiInstalled} -gt 0 ]; then
+  /home/admin/_cache.sh set message "Deactivated API/WebUI (as in your config) - please use SSH for further setup"
+  sleep 10
+else
   /home/admin/_cache.sh set message "Installing Services"
+fi
 
 # BLITZ WEB SERVICE
 echo "Provisioning BLITZ WEB SERVICE - run config script" >> ${logFile}
 /home/admin/config.scripts/blitz.web.sh https-on >> ${logFile} 2>&1
 
-echo "### CHECKING BLITZ-API/FRONT STATUS ###" >> ${logFile}
-blitzApiInstalled=$(systemctl status blitzapi | grep -c "loaded")
-echo "# blitzapi(${blitzapi}) blitzApiInstalled(${blitzApiInstalled})"
-
 # deinstall when not explizit 'on' when blitzapi is installed by fatpack
 # https://github.com/raspiblitz/raspiblitz/issues/4171#issuecomment-1728302628
 if [ "${blitzapi}" != "on" ] && [ ${blitzApiInstalled} -gt 0 ]; then
   echo "blitz_api directory exists & blitzapi is not 'on' - deactivating blitz-api" >> ${logFile}
-  /home/admin/_cache.sh set message "Deactivate API/WebUI"
   /home/admin/config.scripts/blitz.web.api.sh off >> ${logFile} 2>&1
   /home/admin/config.scripts/blitz.web.ui.sh off >> ${logFile} 2>&1
 fi

home.admin/_version.info

@@ -1,3 +1,3 @@
 # RaspiBlitz Version - always [major].[main].[sub] (sub can be a string like '2rc1')
-codeVersion="1.11.0rc4"
+codeVersion="1.11.0rc5"
 # keep last line with comment ---> IF YOU HAVE A NEW VERSION BRANCH > EDIT ALSO build_sdcard.sh

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # https://github.com/romanz/electrs/releases
-ELECTRSVERSION="v0.10.2"
+ELECTRSVERSION="v0.10.4"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@@ -55,7 +55,10 @@ if [ "$1" = "status" ]; then
     localPortRunning=$(sudo netstat -an | grep -c '0.0.0.0:50001')
     echo "localTCPPortActive=${localPortRunning}"
 
-    publicPortRunning=$(nc -z -w6 ${publicip} 50001 2>/dev/null; echo $?)
+    publicPortRunning=$(
+      nc -z -w6 ${publicip} 50001 2>/dev/null
+      echo $?
+    )
     if [ "${publicPortRunning}" == "0" ]; then
       # OK looks good - but just means that something is answering on that port
       echo "publicTCPPortAnswering=1"
@@ -66,7 +69,10 @@ if [ "$1" = "status" ]; then
     echo "portSSL='50002'"
     localPortRunning=$(sudo netstat -an | grep -c '0.0.0.0:50002')
     echo "localHTTPPortActive=${localPortRunning}"
-    publicPortRunning=$(nc -z -w6 ${publicip} 50002 2>/dev/null; echo $?)
+    publicPortRunning=$(
+      nc -z -w6 ${publicip} 50002 2>/dev/null
+      echo $?
+    )
     if [ "${publicPortRunning}" == "0" ]; then
       # OK looks good - but just means that something is answering on that port
       echo "publicHTTPPortAnswering=1"
@@ -194,9 +200,9 @@ Check 'sudo nginx -t' for a detailed error message.
   fi
 
   # Options (available without TOR)
-  OPTIONS=( \
+  OPTIONS=(
-        CONNECT "How to Connect" \
+    CONNECT "How to Connect"
-        REINDEX "Delete&Rebuild Index" \
+    REINDEX "Delete&Rebuild Index"
     STATUS "ElectRS Status Info"
   )
 
@@ -264,7 +270,7 @@ fi
 echo "# Making sure services are not running"
 sudo systemctl stop electrs 2>/dev/null
 
-# uninstall
+# install
 if [ "$1" = "install" ]; then
   echo "# INSTALL ELECTRS"
 
@@ -300,14 +306,7 @@ if [ "$1" = "install" ]; then
 
     # build
     sudo -u electrs /home/electrs/.cargo/bin/cargo build --locked --release || exit 1
-
-    echo
-    echo "# The electrs database will be built in /mnt/hdd/app-storage/electrs/db. Takes ~18 hours and ~50Gb diskspace"
-    echo
-    sudo mkdir /mnt/hdd/app-storage/electrs 2>/dev/null
-    sudo chown -R electrs:electrs /mnt/hdd/app-storage/electrs
   fi
-
   exit 0
 fi
 
@@ -315,6 +314,16 @@ fi
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then
   echo "# ACTIVATING ELECTRS"
 
+  # check and create storage dir
+  if ! sudo ls /mnt/hdd/app-storage/electrs 2>/dev/null; then
+    sudo mkdir /mnt/hdd/app-storage/electrs
+    echo
+    echo "# The electrs database will be built in /mnt/hdd/app-storage/electrs/db. Takes ~18 hours and ~50Gb diskspace"
+    echo
+  fi
+  # always fix user id
+  sudo chown -R electrs:electrs /mnt/hdd/app-storage/electrs
+
   isInstalled=$(sudo ls /etc/systemd/system/electrs.service 2>/dev/null | grep -c 'electrs.service')
   if [ ${isInstalled} -eq 0 ]; then
 
@@ -365,8 +374,7 @@ server_banner = \"Welcome to electrs $ELECTRSVERSION - the Electrum Rust Server
     echo
     echo "# Checking for config.toml"
     echo
-    if [ ! -f "/home/electrs/.electrs/config.toml" ]
+    if [ ! -f "/home/electrs/.electrs/config.toml" ]; then
-        then
       echo "Failed to create config.toml"
       exit 1
     else

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

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

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

@@ -1,10 +1,14 @@
 #!/bin/bash
 
+# Deactivated - see https://github.com/raspiblitz/raspiblitz/issues/4122
+# Needs comitted maintainer or will be removed in future versions
+
 # https://github.com/lnproxy/lnproxy/commits/main
 LNPROXYVERSION="c1031bbe507623f8f196ff83aa5ea504cca05143"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
+  echo "DEACTIVATED FOR REPAIR - see #4122"
   echo "config script to install or uninstall the lnproxy server"
   echo "bonus.lnproxy.sh [on|off|menu]"
   echo "installs the version $LNPROXYVERSION by default"
@@ -83,7 +87,18 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
 
   # build
   sudo -u lnproxy /usr/local/go/bin/go get lnproxy
+  if [ $? -ne 0 ]; then
+    echo "# FAIL -> go get lnproxy"
+    sudo userdel -rf lnproxy 2>/dev/null
+    exit 1
+  fi
+
   sudo -u lnproxy /usr/local/go/bin/go build
+  if [ $? -ne 0 ]; then
+    echo "# FAIL -> go build"
+    sudo userdel -rf lnproxy 2>/dev/null
+    exit 1
+  fi
 
   # manual start (in tmux)
   # sudo -u lnproxy /home/lnproxy/lnproxy/lnproxy -lnd-cert /home/lnproxy/.lnd/tls.cert /home/lnproxy/lnproxy.macaroon

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

@@ -2,7 +2,7 @@
 # https://lightning.readthedocs.io/
 
 # https://github.com/ElementsProject/lightning/releases
-CLVERSION="v23.11.2"
+CLVERSION="v24.02.1"
 
 # install the latest master by using the last commit id
 # https://github.com/ElementsProject/lightning/commit/master

home.admin/setup.scripts/controlSetupDialog.sh

@@ -17,7 +17,7 @@ echo "# RASPIBLITZ SETUP STATE" > $SETUPFILE
 sudo chown admin:admin $SETUPFILE
 sudo chmod 777 $SETUPFILE
 
-source <(/home/admin/_cache.sh get setupPhase dnsworking)
+source <(/home/admin/_cache.sh get dnsworking)
 
 # remember original setupphase
 orgSetupPhase="${setupPhase}"
@@ -90,7 +90,8 @@ if [ "${setupPhase}" == "migration" ]; then
 
 fi
 
-source <(/home/admin/_cache.sh get setupPhase)
+# fresh import setup values
+source /home/admin/raspiblitz.info
 
 ############################################
 # DEFAULT: Basic Setup menu