From ed7e1f10febfce90a2ba521e6dda8f3308b7b1a6 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Wed, 12 Jun 2024 14:05:42 -0700 Subject: [PATCH 1/2] RTL v0.15.2 update on LND --- ride-the-lightning/docker-compose.yml | 3 ++- ride-the-lightning/umbrel-app.yml | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ride-the-lightning/docker-compose.yml b/ride-the-lightning/docker-compose.yml index bb120fde44..bae21eabf7 100644 --- a/ride-the-lightning/docker-compose.yml +++ b/ride-the-lightning/docker-compose.yml @@ -7,7 +7,7 @@ services: APP_PORT: 3001 web: - image: shahanafarooqui/rtl:0.14.1@sha256:88bbf2dac4a5eedd0b692e97bc6c50a5266f44aff8215770ea2fc4eb7495e41e + image: shahanafarooqui/rtl:v0.15.2@sha256:5473e45c18e86c479ac8e7485f06e7c31948d5dc0726306f3850cf8ee635cbcd user: "1000:1000" restart: on-failure stop_grace_period: 1m @@ -24,6 +24,7 @@ services: RTL_CONFIG_PATH: "/data" CHANNEL_BACKUP_PATH: "/data/backup" LN_IMPLEMENTATION: "LND" + BLOCK_EXPLORER_URL: 'https://mempool.space' # LND connection details LN_SERVER_URL: "https://$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT" diff --git a/ride-the-lightning/umbrel-app.yml b/ride-the-lightning/umbrel-app.yml index 59f12f5a2c..930ce92311 100644 --- a/ride-the-lightning/umbrel-app.yml +++ b/ride-the-lightning/umbrel-app.yml @@ -2,7 +2,7 @@ manifestVersion: 1 id: ride-the-lightning category: bitcoin name: Ride The Lightning -version: "0.14.1-beta-boltzclient" +version: "0.15.2-beta" tagline: A powerful dashboard for the Lightning Network description: >- RTL is a full function, device agnostic, web user interface to help @@ -40,7 +40,15 @@ gallery: - 2.jpg - 3.jpg releaseNotes: >- - This release upgrades the Ride The Lightning app to use boltz-client, which employs taproot swaps by default and introduces additional changes under the hood. + - Integration with mempool.space api to display prevailing fee rates on various channel open/close modals + + - Links enabled for viewing transactions on mempool.space from modals of on-chain transactions and channel info + + - Added a new config param blockExplorerUrl (-e BLOCK_EXPLORER_URL) to customize for a local/testnet instances of mempool.space + + - CPFP enabled on pending on-chain receive transactions (including funds expected from coop close) + + - Simplification of pending channel open fee bumping modal Full release notes for boltz-client can be found at https://github.com/BoltzExchange/boltz-client/releases From 09efd3fc7fad014c0f4d11d8158a8a4e1528db03 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Wed, 26 Jun 2024 22:14:26 +1000 Subject: [PATCH 2/2] Dynamically set BLOCK_EXPLORER_URL based on Bitcoin Node network --- ride-the-lightning/docker-compose.yml | 4 ++-- ride-the-lightning/exports.sh | 17 +++++++++++++++++ ride-the-lightning/rtl/.gitkeep | 0 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ride-the-lightning/exports.sh create mode 100644 ride-the-lightning/rtl/.gitkeep diff --git a/ride-the-lightning/docker-compose.yml b/ride-the-lightning/docker-compose.yml index bae21eabf7..809ca45005 100644 --- a/ride-the-lightning/docker-compose.yml +++ b/ride-the-lightning/docker-compose.yml @@ -7,7 +7,7 @@ services: APP_PORT: 3001 web: - image: shahanafarooqui/rtl:v0.15.2@sha256:5473e45c18e86c479ac8e7485f06e7c31948d5dc0726306f3850cf8ee635cbcd + image: shahanafarooqui/rtl:v0.15.2@sha256:e2c40d04821a1a6e9bcb55b4276c428c6c416ab1c33b4efd256366430234ea6a user: "1000:1000" restart: on-failure stop_grace_period: 1m @@ -24,7 +24,7 @@ services: RTL_CONFIG_PATH: "/data" CHANNEL_BACKUP_PATH: "/data/backup" LN_IMPLEMENTATION: "LND" - BLOCK_EXPLORER_URL: 'https://mempool.space' + BLOCK_EXPLORER_URL: "${APP_RTL_BLOCK_EXPLORER_URL}" # LND connection details LN_SERVER_URL: "https://$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT" diff --git a/ride-the-lightning/exports.sh b/ride-the-lightning/exports.sh new file mode 100644 index 0000000000..17cfecb692 --- /dev/null +++ b/ride-the-lightning/exports.sh @@ -0,0 +1,17 @@ +# Dynamically export the block explorer URL based on what network the Bitcoin node is running on + +BLOCK_EXPLORER_URL="https://mempool.space" + +# TODO: check for umbrelOS Mempool app and use local URL if installed +# e.g., "${UMBREL_ROOT}/scripts/app" ls-installed | grep --quiet 'mempool' +# RTL would need a way to dynamically construct the URL for the local Mempool app +# e.g., localExplorerUrl = `${window.location.protocol}//${window.location.hostname}:${LOCAL_MEMPOOL_PORT}`; + +# Append APP_BITCOIN_NETWORK to the URL if it is not mainnet (e.g., https://mempool.space/testnet) +if [[ "${APP_BITCOIN_NETWORK}" != "mainnet" ]]; then + echo "Bitcoin is running on ${APP_BITCOIN_NETWORK}. Appending ${APP_BITCOIN_NETWORK} to the block explorer URL." + BLOCK_EXPLORER_URL="${BLOCK_EXPLORER_URL}/${APP_BITCOIN_NETWORK}" + echo "BLOCK_EXPLORER_URL: ${BLOCK_EXPLORER_URL}" +fi + +export APP_RTL_BLOCK_EXPLORER_URL="${BLOCK_EXPLORER_URL}" diff --git a/ride-the-lightning/rtl/.gitkeep b/ride-the-lightning/rtl/.gitkeep new file mode 100644 index 0000000000..e69de29bb2