Update Lightning Node (#387)

lightning/data/lnd/lnd.conf

@@ -1,11 +0,0 @@
-[Application Options]
-maxpendingchannels=3
-minchansize=10000
-accept-keysend=true
-accept-amp=1
-
-[Bitcoin]
-bitcoin.defaultchanconfs=2
-
-[rpcmiddleware]
-rpcmiddleware.enable=true

lightning/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       APP_PORT: 3006
 
   app:
-    image: getumbrel/umbrel-lightning:v1.0.4@sha256:6b8fd427901e297578bc6c72debf5d7cdac8ca3636580f6eea356eec8c164571
+    image: getumbrel/umbrel-lightning:v1.1.1@sha256:43e22766c38d19bdedc54e8eb9f4ce621d9e27157eae20b20a20fcf72b52405f
     restart: on-failure
     volumes:
       - "${APP_LIGHTNING_NODE_DATA_DIR}:/data/.lnd"
@@ -30,6 +30,9 @@ services:
       CHANNEL_BACKUP_FILE: "/data/.lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/channel.backup"
       BACKUP_STATUS_FILE: "/statuses/backup-status.json"
       JSON_STORE_FILE: "/data/state.json"
+      JSON_SETTINGS_FILE: "/data/settings.json"
+      UMBREL_LND_CONF_FILEPATH: "/data/.lnd/umbrel-lnd.conf"
+      LND_CONF_FILEPATH: "/data/.lnd/lnd.conf"
       DEVICE_DOMAIN_NAME: "${DEVICE_DOMAIN_NAME}"
       EXPLORER_PORT: "${APP_MEMPOOL_PORT}"
       EXPLORER_HIDDEN_SERVICE: "${APP_MEMPOOL_HIDDEN_SERVICE}"
@@ -42,7 +45,7 @@ services:
     image: lightninglabs/lnd:v0.15.5-beta@sha256:ce94136ccfc48d36f058ae48fdeb53d84dbbb8f972bbae3af98e4fdfb98d641b
     command: "${APP_LIGHTNING_COMMAND}"
     user: 1000:1000
-    restart: on-failure
+    restart: unless-stopped
     ports:
       - "$APP_LIGHTNING_NODE_PORT:$APP_LIGHTNING_NODE_PORT"
       - "$APP_LIGHTNING_NODE_REST_PORT:$APP_LIGHTNING_NODE_REST_PORT"

lightning/exports.sh

@@ -6,30 +6,12 @@ export APP_LIGHTNING_NODE_GRPC_PORT="10009"
 export APP_LIGHTNING_NODE_REST_PORT="8080"
 export APP_LIGHTNING_NODE_DATA_DIR="${EXPORTS_APP_DIR}/data/lnd"
 
-LND_BITCOIN_NODE="bitcoind"
-
 BIN_ARGS=()
+BIN_ARGS+=( "--configfile=/data/.lnd/umbrel-lnd.conf" )
 # [Application Options]
 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+=( "--tlsautorefresh" )
-
-# 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" )
-
-# Lightning Terminal (litd) now requires this flag to be set or it will not startup
-BIN_ARGS+=( "--rpcmiddleware.enable" )
-
-# [Bitcoind]
-BIN_ARGS+=( "--bitcoind.rpchost=${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_RPC_PORT}" )
-BIN_ARGS+=( "--bitcoind.rpcuser=${APP_BITCOIN_RPC_USER}" )
-BIN_ARGS+=( "--bitcoind.rpcpass=${APP_BITCOIN_RPC_PASS}" )
-BIN_ARGS+=( "--bitcoind.zmqpubrawblock=tcp://${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_ZMQ_RAWBLOCK_PORT}" )
-BIN_ARGS+=( "--bitcoind.zmqpubrawtx=tcp://${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_ZMQ_RAWTX_PORT}" )
 
 # [Bitcoin]
 BIN_ARGS+=( "--bitcoin.active" )
@@ -44,7 +26,14 @@ elif [[ "${APP_BITCOIN_NETWORK}" == "regtest" ]]; then
 else
 	echo "Warning (${EXPORTS_APP_ID}): Bitcoin Network '${APP_BITCOIN_NETWORK}' is not supported"
 fi
-BIN_ARGS+=( "--bitcoin.node=${LND_BITCOIN_NODE}" )
+BIN_ARGS+=( "--bitcoin.node=bitcoind" )
+
+# [Bitcoind]
+BIN_ARGS+=( "--bitcoind.rpchost=${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_RPC_PORT}" )
+BIN_ARGS+=( "--bitcoind.rpcuser=${APP_BITCOIN_RPC_USER}" )
+BIN_ARGS+=( "--bitcoind.rpcpass=${APP_BITCOIN_RPC_PASS}" )
+BIN_ARGS+=( "--bitcoind.zmqpubrawblock=tcp://${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_ZMQ_RAWBLOCK_PORT}" )
+BIN_ARGS+=( "--bitcoind.zmqpubrawtx=tcp://${APP_BITCOIN_NODE_IP}:${APP_BITCOIN_ZMQ_RAWTX_PORT}" )
 
 # [tor]
 BIN_ARGS+=( "--tor.active" )
@@ -61,4 +50,4 @@ export APP_LIGHTNING_COMMAND=$(IFS=" "; echo "${BIN_ARGS[@]}")
 rest_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-rest/hostname"
 grpc_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-grpc/hostname"
 export APP_LIGHTNING_REST_HIDDEN_SERVICE="$(cat "${rest_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
-export APP_LIGHTNING_GRPC_HIDDEN_SERVICE="$(cat "${grpc_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
+export APP_LIGHTNING_GRPC_HIDDEN_SERVICE="$(cat "${grpc_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"

lightning/umbrel-app.yml

@@ -2,19 +2,19 @@ manifestVersion: 1.1
 id: lightning
 category: Finance
 name: Lightning Node
-version: "0.15.5-beta-patch-1"
+version: "0.15.5-beta-2"
 tagline: Run your personal Lightning Network node
 description: >-
   Run your personal Lightning Network node, and join the future of Bitcoin today.
 
 
-  The Lightning Network allows ultra cheap and almost instant Bitcoin transactions.
-  By running a Lightning node, you can not only self-custody your Bitcoin on
-  Lightning, but also earn sats by routing payments on the network.
+  The Lightning Network allows ultra cheap and almost instant Bitcoin transactions. By running a Lightning node, you can not only self-custody your Bitcoin on Lightning, but also earn sats by routing payments on the network.
 
 
-  Connect Zeus Wallet, Zap, or any other wallet that supports lndconnect
-  to remotely manage and access your node from anywhere.
+  Connect Zeus Wallet, Zap, or any other wallet that supports lndconnect to remotely manage and access your node from anywhere.
+
+
+  With the Advanced Settings feature, you can take control of your node and customize it to your needs. Personalize it with a name, enable larger channels, limit channel sizes, set your routing fees, optimize your routing strategy, add watchtower services, fine-tune its performance, and much more.
 
 
   Powered by LND.
@@ -22,23 +22,20 @@ description: >-
 
   An official app from Umbrel.
 releaseNotes: >-
-  Umbrel patch:
-    - LND will now connect to Bitcoin Core on other networks e.g. testnet
-
-  LND Bug Fixes:
+  Introducing Advanced Settings. Take control of your node and customize it to your needs.
 
-  - A Taproot related key tweak issue was fixed in btcd that affected remote signing setups.
 
-  - Taproot changes addresses are now used by default for the SendCoins RPC.
+  - Personalize your node by giving it a name and color.
 
-  - A 1 second interval has been added between FundingLocked receipt checks. This reduces idle CPU usage for pending/dangling funding attempts.
+  - Enable larger channels, and limit channel sizes.
 
-  - The wallet birthday is now used properly when creating a watch-only wallet to avoid scanning the whole chain.
+  - Set your routing fees, and optimize your routing strategy.
 
-  - Taproot outputs are now correctly shown as SCRIPT_TYPE_WITNESS_V1_TAPROOT in the output of GetTransactions (lncli listchaintxns).
+  - Add watchtower services to guard your channels, and run a service for others.
 
+  - Fine-tune the performance and resource usage of your node.
 
-  Full changelog can be found here: https://github.com/lightningnetwork/lnd/blob/v0-15-5-branch/docs/release-notes/release-notes-0.15.5.md
+  - And much more!
 developer: Umbrel
 website: https://umbrel.com
 dependencies: