Merge pull request #3085 from openoms/updates

tested updates for v1.8
2025-03-27 02:01:53 +01:00 · 2022-05-13 13:12:37 +01:00 · 2022-05-13 13:12:37 +01:00 · 3febd00c7f
commit 3febd00c7f
parent 539afe9882 66061e6a9b
6 changed files with 79 additions and 67 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -11,6 +11,7 @@
 - Update: RTL v0.12.3 [details](https://github.com/Ride-The-Lightning/RTL/releases/tag/v0.12.3)
 - Update: C-lightningREST v0.7.0 [details](https://github.com/Ride-The-Lightning/c-lightning-REST/releases/tag/v0.7.0)
 - Update: Channel Tools (chantools) v0.10.4 [details](https://github.com/guggero/chantools/blob/master/README.md)
+- Update: Electrum Server in Rust (electrs) v0.9.7 [details](https://github.com/romanz/electrs/blob/master/RELEASE-NOTES.md#097-apr-30-2022)
 - Update: BTCPayServer v1.5.1 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v1.5.1)
 - Info: Run RaspiBlitz on VirtualBox & TrueNAS [details](https://github.com/rootzoll/raspiblitz/tree/dev/alternative.platforms)

--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@ -433,7 +433,7 @@ btc.rpc.password=$PASSWORD_B
    sudo -u btcpay git clone https://github.com/btcpayserver/btcpayserver.git 2>/dev/null
    cd btcpayserver
    sudo -u btcpay git reset --hard $BTCPayVersion
-    
+
    # sudo -u btcpay /home/admin/config.scripts/blitz.git-verify.sh \
    #  "web-flow" "https://github.com/web-flow.gpg" "4AEE18F83AFDEB23" || exit 1
    sudo -u btcpay /home/admin/config.scripts/blitz.git-verify.sh \
@ -508,7 +508,7 @@ WantedBy=multi-user.target
  # setting value in raspi blitz config
  /home/admin/config.scripts/blitz.conf.sh set BTCPayServer "on"

-  # needed for API/WebUI as signal that install ran thru 
+  # needed for API/WebUI as signal that install ran thru
  echo "result='OK'"
  exit 0
 fi
@ -584,53 +584,54 @@ if [ "$1" = "0" ] || [ "$1" = "off" ]; then
    echo "# BTCPayServer is not installed."
  fi

-  # needed for API/WebUI as signal that install ran thru 
+  # needed for API/WebUI as signal that install ran thru
  echo "result='OK'"
 fi

 if [ "$1" = "update" ]; then

-  echo "# Update NBXplorer"
-  cd /home/btcpay || exit 1
-  cd NBXplorer || exit 1
-  # fetch latest master
-  if [ "$(sudo -u btcpay git fetch 2>&1 | grep -c "Please tell me who you are")" -gt 0 ]; then
-    sudo -u btcpay git config user.email "you@example.com"
-    sudo -u btcpay git config user.name "Your Name"
-  fi
-  sudo -u btcpay git fetch
-  # unset $1
-  set --
-  UPSTREAM=${1:-'@{u}'}
-  LOCAL=$(git rev-parse @)
-  REMOTE=$(git rev-parse "$UPSTREAM")
-
-  if [ $LOCAL = $REMOTE ]; then
-    TAG=$(git tag | sort -V | tail -1)
-    echo "# Up-to-date on version $TAG"
-  else
-    echo "# Pulling latest changes..."
-    sudo -u btcpay git pull -p
-    TAG=$(git tag | sort -V | tail -1)
-    echo "# Reset to the latest release tag: $TAG"
-    sudo -u btcpay git reset --hard $TAG
-    sudo -u btcpay /home/admin/config.scripts/blitz.git-verify.sh \
-     "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
-    echo "# Build NBXplorer ..."
-    # from the build.sh with path
-    sudo systemctl stop nbxplorer
-    sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj
-
-    # whitelist localhost in bitcoind
-    if ! sudo grep -Eq "^whitelist=127.0.0.1" /mnt/hdd/bitcoin/bitcoin.conf;then
-      echo "whitelist=127.0.0.1" | sudo tee -a /mnt/hdd/bitcoin/bitcoin.conf
-      echo "# Restarting bitcoind"
-      sudo systemctl restart bitcoind
-    fi
-   
-    sudo systemctl start nbxplorer
-    echo "# Updated NBXplorer to $TAG"
-  fi
+## don't update NBXplorer until https://github.com/rootzoll/raspiblitz/issues/3055 is solved
+#   echo "# Update NBXplorer"
+#   cd /home/btcpay || exit 1
+#   cd NBXplorer || exit 1
+#   # fetch latest master
+#   if [ "$(sudo -u btcpay git fetch 2>&1 | grep -c "Please tell me who you are")" -gt 0 ]; then
+#     sudo -u btcpay git config user.email "you@example.com"
+#     sudo -u btcpay git config user.name "Your Name"
+#   fi
+#   sudo -u btcpay git fetch
+#   # unset $1
+#   set --
+#   UPSTREAM=${1:-'@{u}'}
+#   LOCAL=$(git rev-parse @)
+#   REMOTE=$(git rev-parse "$UPSTREAM")
+#
+#   if [ $LOCAL = $REMOTE ]; then
+#     TAG=$(git tag | sort -V | tail -1)
+#     echo "# Up-to-date on version $TAG"
+#   else
+#     echo "# Pulling latest changes..."
+#     sudo -u btcpay git pull -p
+#     TAG=$(git tag | sort -V | tail -1)
+#     echo "# Reset to the latest release tag: $TAG"
+#     sudo -u btcpay git reset --hard $TAG
+#     sudo -u btcpay /home/admin/config.scripts/blitz.git-verify.sh \
+#      "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
+#     echo "# Build NBXplorer ..."
+#     # from the build.sh with path
+#     sudo systemctl stop nbxplorer
+#     sudo -u btcpay /home/btcpay/dotnet/dotnet build -c Release NBXplorer/NBXplorer.csproj
+#
+#     # whitelist localhost in bitcoind
+#     if ! sudo grep -Eq "^whitelist=127.0.0.1" /mnt/hdd/bitcoin/bitcoin.conf;then
+#       echo "whitelist=127.0.0.1" | sudo tee -a /mnt/hdd/bitcoin/bitcoin.conf
+#       echo "# Restarting bitcoind"
+#       sudo systemctl restart bitcoind
+#     fi
+#
+#     sudo systemctl start nbxplorer
+#     echo "# Updated NBXplorer to $TAG"
+#   fi

  echo "# Update BTCPayServer"
  cd /home/btcpay || exit 1
@ -646,7 +647,7 @@ if [ "$1" = "update" ]; then
  UPSTREAM=${1:-'@{u}'}
  LOCAL=$(git rev-parse @)
  REMOTE=$(git rev-parse "$UPSTREAM")
-  
+
  if [ $LOCAL = $REMOTE ]; then
    TAG=$(git tag | grep v1 | sort -V | tail -1)
    echo "# Up-to-date on version $TAG"
--- a/home.admin/config.scripts/bonus.electrs.sh
+++ b/home.admin/config.scripts/bonus.electrs.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 # https://github.com/romanz/electrs/releases
-ELECTRSVERSION="v0.9.5"
+ELECTRSVERSION="v0.9.7"
 # https://github.com/romanz/electrs/commits/master
 # ELECTRSVERSION="3041e89cd2fb377541b929d852ef6298c2d4e60a"

@ -437,7 +437,7 @@ WantedBy=multi-user.target
    echo "whitelist=download@127.0.0.1" | sudo tee -a /mnt/hdd/bitcoin/bitcoin.conf
    bitcoindRestart=yes
  fi
-  
+
  source <(/home/admin/_cache.sh get state)
  if [ "${state}" == "ready" ]; then
    if [ "${bitcoindRestart}" == "yes" ]; then
--- a/home.admin/config.scripts/bonus.rtl.sh
+++ b/home.admin/config.scripts/bonus.rtl.sh
@ -1,6 +1,7 @@
 #!/bin/bash
-# https://github.com/Ride-The-Lightning/RTL
-RTLVERSION="v0.12.1"
+
+# https://github.com/Ride-The-Lightning/RTL/releases
+RTLVERSION="v0.12.3"

 # check and load raspiblitz config
 # to know which network is running
@ -11,12 +12,16 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
  echo "# config script for RideTheLightning $RTLVERSION WebInterface"
  echo "# able to run intances for lnd and cl parallel"
  echo "# mainnet and testnet instances can run parallel"
-  echo "# bonus.rtl.sh [on|off|menu] <lnd|cl> <mainnet|testnet|signet>"
+  echo "# bonus.rtl.sh [on|off|menu] <lnd|cl> <mainnet|testnet|signet> <purge>"
  echo "# bonus.rtl.sh connect-services"
  echo "# bonus.rtl.sh prestart <lnd|cl> <mainnet|testnet|signet>"
  exit 1
 fi

+PGPsigner="saubyk"
+PGPpubkeyLink="https://github.com/${PGPsigner}.gpg"
+PGPpubkeyFingerprint="00C9E2BC2E45666F"
+
 echo "# Running: 'bonus.rtl.sh $*'"

 source <(/home/admin/config.scripts/network.aliases.sh getvars $2 $3)
@ -159,11 +164,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
    cd /home/rtl/RTL
    # check https://github.com/Ride-The-Lightning/RTL/releases/
    sudo -u rtl git reset --hard $RTLVERSION
-    PGPsigner="saubyk"
-    PGPpubkeyLink="https://github.com/${PGPsigner}.gpg"
-    PGPpubkeyFingerprint="00C9E2BC2E45666F"
+
    sudo -u rtl /home/admin/config.scripts/blitz.git-verify.sh \
     "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" "${RTLVERSION}" || exit 1
+
    # from https://github.com/Ride-The-Lightning/RTL/commits/master
    # git checkout 917feebfa4fb583360c140e817c266649307ef72
    if [ -f /home/rtl/RTL/LICENSE ]; then
@ -174,7 +178,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
      exit 1
    fi
    # install
-    echo "# Run: npm install"
+    echo "# Running npm install ..."
    export NG_CLI_ANALYTICS=false
    sudo -u rtl npm install --only=prod --logLevel warn
    if ! [ $? -eq 0 ]; then
@ -197,7 +201,7 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
  sudo chown -R rtl:rtl /mnt/hdd/app-data/rtl

  echo "# Create Systemd Service: ${systemdService}.service (Template)"
-  echo "
+  echo "\
 # Systemd unit for ${systemdService}

 [Unit]
--- a/home.admin/config.scripts/bonus.suez.sh
+++ b/home.admin/config.scripts/bonus.suez.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 # https://github.com/prusnak/suez/commits/master
-SUEZVERSION="335d43029cdb9da42b5ad55ad2df4cdfeafe0405"
+SUEZVERSION="e402edbddb45d8a53af346b8582243f4068ece6c"

 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
@ -32,15 +32,15 @@ fi
 if [ "$1" = "1" ] || [ "$1" = "on" ]; then
  echo "# INSTALL SUEZ"

-  cd /home/bitcoin || exit 1 
+  cd /home/bitcoin || exit 1

  # dependency
  sudo -u bitcoin curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py\
    | sudo -u bitcoin python -
-  
+
  # download source code
  sudo -u bitcoin git clone https://github.com/prusnak/suez.git
-  cd suez || exit 1 
+  cd suez || exit 1
  sudo -u bitcoin git reset --hard $SUEZVERSION
  sudo -u bitcoin /home/admin/config.scripts/blitz.git-verify.sh \
   "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
@ -80,7 +80,7 @@ fi
 # update
 if [ "$1" = "update" ]; then
  echo "# UPDATE SUEZ"
-  cd /home/bitcoin || exit 1 
+  cd /home/bitcoin || exit 1
  # dependency
  sudo -u bitcoin curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py\
    | sudo -u bitcoin python -
--- a/home.admin/config.scripts/cl.rest.sh
+++ b/home.admin/config.scripts/cl.rest.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 # https://github.com/Ride-The-Lightning/c-lightning-REST/releases/
-CLRESTVERSION="v0.6.1"
+CLRESTVERSION="v0.7.0"

 # help
 if [ $# -eq 0 ]||[ "$1" = "-h" ]||[ "$1" = "--help" ];then
@ -17,6 +17,15 @@ if [ $# -eq 0 ]||[ "$1" = "-h" ]||[ "$1" = "--help" ];then
  exit 1
 fi

+# Example for commits created on GitHub:
+#PGPsigner="web-flow"
+#PGPpubkeyLink="https://github.com/${PGPsigner}.gpg"
+#PGPpubkeyFingerprint="4AEE18F83AFDEB23"
+
+PGPsigner="saubyk"
+PGPpubkeyLink="https://github.com/${PGPsigner}.gpg"
+PGPpubkeyFingerprint="00C9E2BC2E45666F"
+
 source <(/home/admin/config.scripts/network.aliases.sh getvars cl $2)

 echo "# Running 'cl.rest.sh $*'"
@ -93,13 +102,10 @@ if [ "$1" = on ];then
    sudo -u bitcoin git clone https://github.com/saubyk/c-lightning-REST
    cd c-lightning-REST || exit 1
    sudo -u bitcoin git reset --hard $CLRESTVERSION
-    
-    PGPsigner="saubyk"
-    PGPpubkeyLink="https://github.com/${PGPsigner}.gpg"
-    PGPpubkeyFingerprint="00C9E2BC2E45666F"
+
    sudo -u bitcoin /home/admin/config.scripts/blitz.git-verify.sh \
-     "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
-    
+     "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" "${CLRESTVERSION}" || exit 1
+
    sudo -u bitcoin npm install
  fi