Merge branch 'master' into electrumx

apps/registry.json

@@ -310,7 +310,7 @@
         "id": "samourai-server",
         "category": "Wallet Servers",
         "name": "Samourai Server",
-        "version": "1.11.0",
+        "version": "1.12.0",
         "tagline": "Your private backing server for Samourai Wallet",
         "description": "Samourai Server is an exclusive Umbrel app that runs Samourai Dojo and Whirlpool backing servers, and provides you easy step-by-step instructions to connect your Samourai Wallet to them. Samourai Wallet is unrivaled in transaction privacy, but its default configuration is still subject to network level privacy loss.\n\nBy default, Samourai Wallet will connect to its centrally controlled Dojo hosted in Iceland. By hosting your own Samourai Server, you can bypass its servers completely when using Samourai Wallet or Sentinel, and gain total financial sovereignty without any complexity.\n\nBundles Whirlpool CLI v0.10.11.",
         "developer": "Samourai",
@@ -334,7 +334,7 @@
         "id": "specter-desktop",
         "category": "Wallets",
         "name": "Specter Desktop",
-        "version": "1.6.0",
+        "version": "1.7.0",
         "tagline": "Multisig with hardware wallets made easy",
         "description": "Specter Desktop connects to the Bitcoin Core running on your Umbrel and functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets. At the moment Specter Desktop is working with all major hardware wallets including:\n\n- Trezor\n- Ledger\n- KeepKey\n- BitBox02\n- ColdCard (optionally airgapped, using an SD card)\n- Electrum (optionally airgapped, if running Electrum on an airgapped computer/phone)\n- Specter DIY (optionally airgapped, using QR codes)\n- Cobo (airgapped, using QR codes)\n\nSpecter Desktop also supports using the Bitcoin Core on your Umbrel as a hot wallet, by importing or generating a random BIP39 mnemonic, but this feature is experimental and we do not recommend using it at this stage. We plan to add support for other hardware wallets as they come up.",
         "developer": "Crypto Advance",

apps/samourai-server/docker-compose.yml

@@ -19,7 +19,7 @@ services:
         ipv4_address: $APP_SAMOURAI_SERVER_DB_IP
 
   node:
-    image: louneskmt/dojo-nodejs:1.11.0@sha256:6d2102a4f75a60f7cf29e4aea00e0e713cd7b5423d8b29b541591daa19c22d42
+    image: louneskmt/dojo-nodejs:1.12.0@sha256:312c93f2f3fd577cb35dfa59bd4030e4b34cb7cce8ee139485cf1c555b64e7ef
     init: true
     restart: on-failure
     command: "/home/node/app/wait-for-it.sh ${APP_SAMOURAI_SERVER_DB_IP}:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
@@ -27,7 +27,7 @@ services:
     environment:
       # GLOBAL
       COMMON_BTC_NETWORK: $BITCOIN_NETWORK
-      DOJO_NODEJS_VERSION_TAG: 1.11.0
+      DOJO_NODEJS_VERSION_TAG: 1.12.0
       NET_DOJO_TOR_IPV4: $TOR_PROXY_IP
       NET_DOJO_TOR_PORT: $TOR_PROXY_PORT
       NET_DOJO_MYSQL_IPV4: $APP_SAMOURAI_SERVER_DB_IP
@@ -111,7 +111,7 @@ services:
         ipv4_address: $APP_SAMOURAI_SERVER_WHIRLPOOL_IP
 
   nginx:
-    image: nginx:1.19-alpine@sha256:c2ce58e024275728b00a554ac25628af25c54782865b3487b11c21cafb7fabda
+    image: nginx:1.21-alpine@sha256:686aac2769fd6e7bab67663fd38750c135b72d993d0bb0a942ab02ef647fc9c3
     init: true
     restart: on-failure
     command: /bin/sh -c "envsubst < /var/www/connect/js/conf.template.js > /var/www/connect/js/conf.js && /wait-for node:8080 --timeout=720 -- nginx"

apps/specter-desktop/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   web:
-    image: lncm/specter-desktop:v1.6.0@sha256:d641f3f81f2450e4f36803b39dc061a999f48eed8a8c4a1de4110391115938b0
+    image: lncm/specter-desktop:v1.7.0@sha256:bb36623dcae3ddaafca17ca145ba8d88837ddbe850fd4a25b1f85178fd270b29
     stop_signal: SIGINT
     restart: on-failure
     stop_grace_period: 1m

docker-compose.yml

@@ -195,7 +195,7 @@ services:
                         ipv4_address: $NEUTRINO_SWITCHER_IP
         electrs:
               container_name: electrs
-              image: getumbrel/electrs:v0.9.0@sha256:e52c137ec59b44d76695722f03a5fc021c9b02c2e40c324b4bb6094b358561e8
+              image: getumbrel/electrs:v0.9.1@sha256:cf196695423fd5139ccde08e6bb1d7b6b1c9093333c879037801af3a18229c32
               volumes:
                 - ${PWD}/bitcoin:/data/.bitcoin:ro
                 - ${PWD}/electrs:/data

scripts/debug

@@ -32,18 +32,6 @@
 # Try to load Umbrel OS version info to detect Umbrel OS
 [[ -f "/etc/default/umbrel" ]] && source "/etc/default/umbrel"
 
-# function to upload the output to our paste server
-# Based on https://github.com/seejohnrun/haste-client#lightweight-alternative
-upload() {
-  curl \
-    --header "Content-Type: text/plain" \
-    --request POST \
-    --silent \
-    --data-binary @- \
-    https://umbrel-paste.vercel.app/documents \
-    | awk -F '"' '{print "https://umbrel-paste.vercel.app/"$6}'
-}
-
 echo "====================="
 echo "= Umbrel debug info ="
 echo "====================="
@@ -136,6 +124,12 @@ echo "-----------------"
 
 docker ps --format="table {{.Names}}\t{{.Status}}"
 
+echo
+echo "Umbrel logs"
+echo "-----------"
+echo
+docker-compose logs --tail=30 manager middleware
+
 echo
 echo "Bitcoin Core logs"
 echo "-----------------"
@@ -148,11 +142,17 @@ echo "--------"
 echo
 docker-compose logs --tail=30 lnd
 
+echo
+echo "electrs logs"
+echo "--------"
+echo
+docker-compose logs --tail=30 electrs
+
 echo
 echo "Tor logs"
 echo "--------"
 echo
-docker-compose logs --tail=30 tor
+docker-compose logs --tail=10 tor app_tor app_2_tor app_3_tor
 
 installed_apps=$(./scripts/app ls-installed)
 if [[ ! -z "${installed_apps:-}" ]]; then
@@ -194,12 +194,6 @@ if [[ ! -z "${UMBREL_OS:-}" ]]; then
         echo "Please shutdown your Raspberry Pi ('sudo shutdown'), then plug the SSD into the other USB3 port."
         echo "After you've finished that, boot your Raspberry Pi back up. If it still still doesn't work,"
         echo "you can contact us on Telegram (t.me/getumbrel) and share the output of this script."
-        if [[ "${1}" == "--upload" ]]; then
-            echo "You can also share these links instead:"
-            echo "$(./scripts/debug | sed '/onion/d') === Umbrel-Paste split === $(dmesg)" | upload
-        else
-            echo "Run this script again with the --upload flag to automatically generate a link to share."
-        fi
         exit 0
     fi
     if [[ $no_of_block_devices -gt 1 ]]; then
@@ -211,15 +205,4 @@ if [[ ! -z "${UMBREL_OS:-}" ]]; then
     fi
 fi
 
-if [[ "${1}" == "--dashboard" ]]; then
+echo "The debug script did not automatically detect any issues with your Umbrel."
-    echo "The debug script did not automatically detect any issues with your Umbrel."
-elif [[ "${1}" == "--upload" ]]; then
-    # This runs the script twice, but it works
-    echo "This script could not automatically detect an issue with your Umbrel."
-    echo "Please share the following links and paste it in the Umbrel Telegram group (https://t.me/getumbrel) so we can help you with your problem."
-    echo "$(./scripts/debug | sed '/onion/d') === Umbrel-Paste split === $(dmesg)" | upload
-else
-    echo "This script could not automatically detect an issue with your Umbrel."
-    echo "Please copy the entire output of this script and paste it in the Umbrel Telegram group (https://t.me/getumbrel) so we can help you with your problem."
-    echo "It's recommended to upload the output somewhere and share a link to it. Run this script with '--upload' to automatically generate a link to share."
-fi