From ad753b9d168682303da681e6d08b75754006f01a Mon Sep 17 00:00:00 2001 From: Wes van der Vleuten <16665772+WesVleuten@users.noreply.github.com> Date: Thu, 1 Sep 2022 05:51:23 +0200 Subject: [PATCH 1/4] Added missing backend docker config --- docker/backend/mempool-config.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index b5b1a16b7..9ac2d4f7a 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -67,6 +67,22 @@ "ENABLED": __BISQ_ENABLED__, "DATA_PATH": "__BISQ_DATA_PATH__" }, + "LIGHTNING": { + "ENABLED": __LIGHTNING_ENABLED__, + "BACKEND": "__LIGHTNING_BACKEND__", + "STATS_REFRESH_INTERVAL": __LIGHTNING_STATS_REFRESH_INTERVAL__, + "GRAPH_REFRESH_INTERVAL": __LIGHTNING_GRAPH_REFRESH_INTERVAL__, + "LOGGER_UPDATE_INTERVAL": __LIGHTNING_LOGGER_UPDATE_INTERVAL__, + "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__" + }, + "LND": { + "TLS_CERT_PATH": "__LND_TLS_CERT_PATH__", + "MACAROON_PATH": "__LND_MACAROON_PATH__", + "REST_API_URL": "__LND_REST_API_URL__" + }, + "CLIGHTNING": { + "SOCKET": "__CLN_SOCKET__" + }, "SOCKS5PROXY": { "ENABLED": __SOCKS5PROXY_ENABLED__, "USE_ONION": __SOCKS5PROXY_USE_ONION__, From 95cd01d1fa9ae482d47f76078ab3a2c7bc8baf67 Mon Sep 17 00:00:00 2001 From: Wes van der Vleuten <16665772+WesVleuten@users.noreply.github.com> Date: Thu, 1 Sep 2022 06:56:05 +0200 Subject: [PATCH 2/4] Accept the CLA for @WesVleuten --- contributors/WesVleuten.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contributors/WesVleuten.txt diff --git a/contributors/WesVleuten.txt b/contributors/WesVleuten.txt new file mode 100644 index 000000000..a13bde140 --- /dev/null +++ b/contributors/WesVleuten.txt @@ -0,0 +1,3 @@ +I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of September 1, 2022. + +Signed: WesVleuten From 50ae075b1f1b8f22c271b60be667b2bca2041222 Mon Sep 17 00:00:00 2001 From: Wes van der Vleuten <16665772+WesVleuten@users.noreply.github.com> Date: Mon, 5 Sep 2022 19:02:13 +0200 Subject: [PATCH 3/4] Fixed CLN to CLIGHTNING --- docker/README.md | 4 ++-- docker/backend/mempool-config.json | 2 +- docker/backend/start.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/README.md b/docker/README.md index affe1d460..92cc1df6d 100644 --- a/docker/README.md +++ b/docker/README.md @@ -403,7 +403,7 @@ Corresponding `docker-compose.yml` overrides: `mempool-config.json`: ``` - "CLN": { + "CLIGHTNING": { "SOCKET": "" } ``` @@ -412,6 +412,6 @@ Corresponding `docker-compose.yml` overrides: ``` api: environment: - CLN_SOCKET: "" + CLIGHTNING_SOCKET: "" ... ``` diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json index 9ac2d4f7a..930430127 100644 --- a/docker/backend/mempool-config.json +++ b/docker/backend/mempool-config.json @@ -81,7 +81,7 @@ "REST_API_URL": "__LND_REST_API_URL__" }, "CLIGHTNING": { - "SOCKET": "__CLN_SOCKET__" + "SOCKET": "__CLIGHTNING_SOCKET__" }, "SOCKS5PROXY": { "ENABLED": __SOCKS5PROXY_ENABLED__, diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 8e6a34013..47b768e7d 100644 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -105,7 +105,7 @@ __LND_MACAROON_PATH__=${LND_MACAROON_PATH:=""} __LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"} # CLN -__CLN_SOCKET__=${CLN_SOCKET:=""} +__CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""} mkdir -p "${__MEMPOOL_CACHE_DIR__}" From 5eab47674ceae593d7a60d5628edc2833fc39f7d Mon Sep 17 00:00:00 2001 From: Wes van der Vleuten <16665772+WesVleuten@users.noreply.github.com> Date: Mon, 5 Sep 2022 19:24:34 +0200 Subject: [PATCH 4/4] Fixed forgotten CLN instance --- docker/backend/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 47b768e7d..71c59cb3d 100644 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -203,6 +203,6 @@ sed -i "s!__LND_MACAROON_PATH__!${__LND_MACAROON_PATH__}!g" mempool-config.json sed -i "s!__LND_REST_API_URL__!${__LND_REST_API_URL__}!g" mempool-config.json # CLN -sed -i "s!__CLN_SOCKET__!${__CLN_SOCKET__}!g" mempool-config.json +sed -i "s!__CLIGHTNING_SOCKET__!${__CLIGHTNING_SOCKET__}!g" mempool-config.json node /backend/dist/index.js