From 7d7b37f02e2b7ebdc70b7ad4460151f410fe4fd6 Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Tue, 23 Aug 2022 21:54:31 +0700
Subject: [PATCH] Lightning Node 2.4.0-build-2

---
 lightning/data/lnd/lnd.conf  | 1 +
 lightning/docker-compose.yml | 5 ++++-
 lightning/exports.sh         | 9 ++++++---
 lightning/umbrel-app.yml     | 2 +-
 mempool/exports.sh           | 5 ++++-
 mempool/umbrel-app.yml       | 2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lightning/data/lnd/lnd.conf b/lightning/data/lnd/lnd.conf
index f825634e..ce2682db 100644
--- a/lightning/data/lnd/lnd.conf
+++ b/lightning/data/lnd/lnd.conf
@@ -2,6 +2,7 @@
 maxpendingchannels=3
 minchansize=10000
 accept-keysend=true
+accept-amp=1
 
 [Bitcoin]
 bitcoin.defaultchanconfs=2
\ No newline at end of file
diff --git a/lightning/docker-compose.yml b/lightning/docker-compose.yml
index 5f83572a..3154b420 100644
--- a/lightning/docker-compose.yml
+++ b/lightning/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       APP_PORT: 3006
 
   app:
-    image: getumbrel/umbrel-lightning:v1.0.3@sha256:e20a0fc2113ffd2b0afce00aee0346ba2af961e793b8784fe712ed05f7c9522c
+    image: getumbrel/umbrel-lightning:v1.0.4@sha256:6b8fd427901e297578bc6c72debf5d7cdac8ca3636580f6eea356eec8c164571
     restart: on-failure
     volumes:
       - "${APP_LIGHTNING_NODE_DATA_DIR}:/data/.lnd"
@@ -31,11 +31,14 @@ services:
       BACKUP_STATUS_FILE: "/statuses/backup-status.json"
       JSON_STORE_FILE: "/data/state.json"
       DEVICE_DOMAIN_NAME: "${DEVICE_DOMAIN_NAME}"
+      EXPLORER_PORT: "${APP_MEMPOOL_PORT}"
+      EXPLORER_HIDDEN_SERVICE: "${APP_MEMPOOL_HIDDEN_SERVICE}"
     networks:
       default:
         ipv4_address: $APP_LIGHTNING_IP
   
   lnd:
+    hostname: "${DEVICE_DOMAIN_NAME}" # Needed so LND can generate a valid cert
     image: lightninglabs/lnd:v0.15.0-beta@sha256:d227a9db0727ff56020c8d6604c8c369757123d238ab6ce679579c2dd0d0d259
     command: "${APP_LIGHTNING_COMMAND}"
     user: 1000:1000
diff --git a/lightning/exports.sh b/lightning/exports.sh
index 58a10bca..ee03b7c7 100644
--- a/lightning/exports.sh
+++ b/lightning/exports.sh
@@ -13,10 +13,13 @@ BIN_ARGS=()
 BIN_ARGS+=( "--listen=0.0.0.0:${APP_LIGHTNING_NODE_PORT}" )
 BIN_ARGS+=( "--rpclisten=0.0.0.0:${APP_LIGHTNING_NODE_GRPC_PORT}" )
 BIN_ARGS+=( "--restlisten=0.0.0.0:${APP_LIGHTNING_NODE_REST_PORT}" )
-BIN_ARGS+=( "--tlsextraip=${APP_LIGHTNING_NODE_IP}" )
-BIN_ARGS+=( "--tlsextradomain=${DEVICE_DOMAIN_NAME}" )
 BIN_ARGS+=( "--tlsautorefresh" )
-BIN_ARGS+=( "--tlsdisableautofill" )
+
+# We recently added this to the default lnd.conf
+# Adding here too as a super simple way to enable for all existing users.
+# If users want to disable this we should remove this and instead insert it in
+# lnd.conf for existing users via a migration.
+BIN_ARGS+=( "--accept-amp" )
 
 # [Bitcoind]
 BIN_ARGS+=( "--bitcoind.rpchost=${APP_BITCOIN_NODE_IP}" )
diff --git a/lightning/umbrel-app.yml b/lightning/umbrel-app.yml
index 8706a60f..5a0a45b4 100644
--- a/lightning/umbrel-app.yml
+++ b/lightning/umbrel-app.yml
@@ -2,7 +2,7 @@ manifestVersion: 1
 id: lightning
 category: Finance
 name: Lightning Node
-version: "0.15.0-beta"
+version: "0.15.0-beta-build-2"
 tagline: Run your personal Lightning Network node
 description: >-
   Run your personal Lightning Network node, and join the future of Bitcoin today.
diff --git a/mempool/exports.sh b/mempool/exports.sh
index 3bd30771..cd66ac2b 100644
--- a/mempool/exports.sh
+++ b/mempool/exports.sh
@@ -1,4 +1,7 @@
 export APP_MEMPOOL_IP="10.21.21.26"
 export APP_MEMPOOL_PORT="3006"
 export APP_MEMPOOL_API_IP="10.21.21.27"
-export APP_MEMPOOL_DB_IP="10.21.21.28"
\ No newline at end of file
+export APP_MEMPOOL_DB_IP="10.21.21.28"
+
+hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}/hostname"
+export APP_MEMPOOL_HIDDEN_SERVICE="$(cat "${hidden_service_file}" 2>/dev/null || echo "")"
\ No newline at end of file
diff --git a/mempool/umbrel-app.yml b/mempool/umbrel-app.yml
index e4fd1926..e93cf0c2 100644
--- a/mempool/umbrel-app.yml
+++ b/mempool/umbrel-app.yml
@@ -2,7 +2,7 @@ manifestVersion: 1
 id: mempool
 category: Explorers
 name: mempool
-version: "2.4.0"
+version: "2.4.0-build-2"
 tagline: A self-hosted explorer for the Bitcoin community
 description: >-
   Trusted third parties are security holes. Self-host your own