Merge branch 'stable' into beta

app/app-manager.py

@@ -110,9 +110,12 @@ elif args.action == 'uninstall':
         print("App {} is not installed".format(args.app))
         exit(1)
     print("Stopping app {}...".format(args.app))
-    compose(args.app, "rm --force --stop")
-    print("Deleting data...")
-    deleteData(args.app)
+    try:
+        compose(args.app, "rm --force --stop")
+        print("Deleting data...")
+        deleteData(args.app)
+    except:
+        pass
     print("Removing from the list of installed apps...")
     setRemoved(args.app)
 elif args.action == 'stop':

app/lib/composegenerator/v2/utils/networking.py

@@ -83,7 +83,7 @@ def getContainerHiddenService(
                         metadata.name, container.name, key, metadata.id, container.name
                     )
                     otherHiddenServices += "HiddenServicePort {} {}:{}".format(
-                        key, containerIp, value
+                        value, containerIp, value
                     )
                 elif isinstance(value, list):
                     otherHiddenServices += getHiddenServiceMultiPort(

app/lib/metadata.py

@@ -146,7 +146,7 @@ def getPortsOldApp(app, appId):
 def getPortsV3App(app, appId):
     for appContainer in app["containers"]:
         if "port" in appContainer:
-            if "preferredOutsidePort" in appContainer and "requirsesPort" in appContainer and appContainer["requiresPort"]:
+            if "preferredOutsidePort" in appContainer and "requiresPort" in appContainer and appContainer["requiresPort"]:
                 validatePort(appContainer, appContainer["preferredOutsidePort"], appId, 2)
             elif "preferredOutsidePort" in appContainer:
             

docker-compose.yml

@@ -209,7 +209,7 @@ services:
         ipv4_address: $NEUTRINO_SWITCHER_IP
   electrum:
     container_name: electrum
-    image: ghcr.io/runcitadel/electrs:v0.9.5@sha256:5fdd76415645de14f31c43844dc143b1477f86872d2f73a041c5005d469ed510
+    image: ghcr.io/runcitadel/electrs:v0.9.6@sha256:cf08513b8aa6f081e42ea92c5903d520db2caedbc20aaccf70f844663bbc8646
     working_dir: /data
     volumes:
     - ${PWD}/bitcoin:/bitcoin:ro

scripts/debug

@@ -143,15 +143,24 @@ if [[ "${1}" == "--run" ]]; then
     
     echo
     echo "Lightning logs"
-    echo "--------"
+    echo "--------------"
     echo
     docker compose logs --tail=30 lightning
-    
+
+    echo
+    echo "Electrum logs"
+    echo "-------------"
+    echo
+    docker compose logs --tail=30 electrum
+
     echo
     echo "Tor logs"
     echo "--------"
     echo
     docker compose logs --tail=30 tor
+    docker compose logs --tail=30 app-tor
+    docker compose logs --tail=30 app-2-tor
+    docker compose logs --tail=30 app-3-tor
     
     installed_apps=$(./scripts/app ls-installed)
     if [[ ! -z "${installed_apps:-}" ]]; then

scripts/update/.updateignore

@@ -13,3 +13,4 @@ nginx/*
 services/installed.yml
 apps/sourceMap.json
 apps/.updateignore
+fulcrumx/*

services/lightning/lnd.yml

@@ -1,6 +1,6 @@
 lightning:
   container_name: lightning
-  image: lightninglabs/lnd:v0.14.2-beta@sha256:8318a24a3ad7319e424253eb56efcbf38e820ebc6d6b6edeec6a8a4e3e9314a0
+  image: lightninglabs/lnd:v0.14.3-beta@sha256:6a2234b0aad4caed3d993736816b198d6228f32c59b27ba2218d5ebf516ae905
   user: 1000:1000
   depends_on:
   - tor