From 2435d121819c737c433f14be4d033ab09ab92cc7 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Fri, 19 Aug 2022 22:08:36 +0200 Subject: [PATCH] Add missing lightning configuration variables where needed --- backend/mempool-config.sample.json | 8 ++- .../__fixtures__/mempool-config.template.json | 16 +++++ backend/src/config.ts | 2 + docker/README.md | 65 +++++++++++++++++++ docker/backend/start.sh | 32 +++++++++ 5 files changed, 122 insertions(+), 1 deletion(-) diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index e636c9e2d..86d226154 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -77,13 +77,19 @@ }, "LIGHTNING": { "ENABLED": false, - "BACKEND": "lnd" + "BACKEND": "lnd", + "STATS_REFRESH_INTERVAL": 600, + "GRAPH_REFRESH_INTERVAL": 600, + "LOGGER_UPDATE_INTERVAL": 30 }, "LND": { "TLS_CERT_PATH": "tls.cert", "MACAROON_PATH": "readonly.macaroon", "REST_API_URL": "https://localhost:8080" }, + "CLIGHTNING": { + "SOCKET": "lightning-rpc" + }, "SOCKS5PROXY": { "ENABLED": false, "USE_ONION": true, diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json index e9c5c3576..a42426249 100644 --- a/backend/src/__fixtures__/mempool-config.template.json +++ b/backend/src/__fixtures__/mempool-config.template.json @@ -88,5 +88,21 @@ "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__", "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__", "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__" + }, + "LIGHTNING": { + "ENABLED": "__LIGHTNING_ENABLED__", + "BACKEND": "__LIGHTNING_BACKEND__", + "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__", + "STATS_REFRESH_INTERVAL": 600, + "GRAPH_REFRESH_INTERVAL": 600, + "LOGGER_UPDATE_INTERVAL": 30 + }, + "LND": { + "TLS_CERT_PATH": "", + "MACAROON_PATH": "", + "REST_API_URL": "https://localhost:8080" + }, + "CLIGHTNING": { + "SOCKET": "__CLIGHTNING_SOCKET__" } } diff --git a/backend/src/config.ts b/backend/src/config.ts index 6f6301a65..8c91e104b 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -36,6 +36,7 @@ interface IConfig { TOPOLOGY_FOLDER: string; STATS_REFRESH_INTERVAL: number; GRAPH_REFRESH_INTERVAL: number; + LOGGER_UPDATE_INTERVAL: number; }; LND: { TLS_CERT_PATH: string; @@ -191,6 +192,7 @@ const defaults: IConfig = { 'TOPOLOGY_FOLDER': '', 'STATS_REFRESH_INTERVAL': 600, 'GRAPH_REFRESH_INTERVAL': 600, + 'LOGGER_UPDATE_INTERVAL': 30, }, 'LND': { 'TLS_CERT_PATH': '', diff --git a/docker/README.md b/docker/README.md index dd42462a7..affe1d460 100644 --- a/docker/README.md +++ b/docker/README.md @@ -350,3 +350,68 @@ Corresponding `docker-compose.yml` overrides: PRICE_DATA_SERVER_CLEARNET_URL: "" ... ``` + +
+ +`mempool-config.json`: +``` + "LIGHTNING": { + "ENABLED": false + "BACKEND": "lnd" + "TOPOLOGY_FOLDER": "" + "STATS_REFRESH_INTERVAL": 600 + "GRAPH_REFRESH_INTERVAL": 600 + "LOGGER_UPDATE_INTERVAL": 30 + } +``` + +Corresponding `docker-compose.yml` overrides: +``` + api: + environment: + LIGHTNING_ENABLED: false + LIGHTNING_BACKEND: "lnd" + LIGHTNING_TOPOLOGY_FOLDER: "" + LIGHTNING_STATS_REFRESH_INTERVAL: 600 + LIGHTNING_GRAPH_REFRESH_INTERVAL: 600 + LIGHTNING_LOGGER_UPDATE_INTERVAL: 30 + ... +``` + +
+ +`mempool-config.json`: +``` + "LND": { + "TLS_CERT_PATH": "" + "MACAROON_PATH": "" + "REST_API_URL": "https://localhost:8080" + } +``` + +Corresponding `docker-compose.yml` overrides: +``` + api: + environment: + LND_TLS_CERT_PATH: "" + LND_MACAROON_PATH: "" + LND_REST_API_URL: "https://localhost:8080" + ... +``` + +
+ +`mempool-config.json`: +``` + "CLN": { + "SOCKET": "" + } +``` + +Corresponding `docker-compose.yml` overrides: +``` + api: + environment: + CLN_SOCKET: "" + ... +``` diff --git a/docker/backend/start.sh b/docker/backend/start.sh index d56b4bfeb..8e6a34013 100644 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -91,6 +91,22 @@ __EXTERNAL_DATA_SERVER_LIQUID_ONION__=${EXTERNAL_DATA_SERVER_LIQUID_ONION:=http: __EXTERNAL_DATA_SERVER_BISQ_URL__=${EXTERNAL_DATA_SERVER_BISQ_URL:=https://bisq.markets/api} __EXTERNAL_DATA_SERVER_BISQ_ONION__=${EXTERNAL_DATA_SERVER_BISQ_ONION:=http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api} +# LIGHTNING +__LIGHTNING_ENABLED__=${LIGHTNING_ENABLED:=false} +__LIGHTNING_BACKEND__=${LIGHTNING_BACKEND:="lnd"} +__LIGHTNING_TOPOLOGY_FOLDER__=${LIGHTNING_TOPOLOGY_FOLDER:=""} +__LIGHTNING_STATS_REFRESH_INTERVAL__=${LIGHTNING_STATS_REFRESH_INTERVAL:=600} +__LIGHTNING_GRAPH_REFRESH_INTERVAL__=${LIGHTNING_GRAPH_REFRESH_INTERVAL:=600} +__LIGHTNING_LOGGER_UPDATE_INTERVAL__=${LIGHTNING_LOGGER_UPDATE_INTERVAL:=30} + +# LND +__LND_TLS_CERT_PATH__=${LND_TLS_CERT_PATH:=""} +__LND_MACAROON_PATH__=${LND_MACAROON_PATH:=""} +__LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"} + +# CLN +__CLN_SOCKET__=${CLN_SOCKET:=""} + mkdir -p "${__MEMPOOL_CACHE_DIR__}" sed -i "s/__MEMPOOL_NETWORK__/${__MEMPOOL_NETWORK__}/g" mempool-config.json @@ -173,4 +189,20 @@ sed -i "s!__EXTERNAL_DATA_SERVER_LIQUID_ONION__!${__EXTERNAL_DATA_SERVER_LIQUID_ sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_URL__!${__EXTERNAL_DATA_SERVER_BISQ_URL__}!g" mempool-config.json sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_ONION__!${__EXTERNAL_DATA_SERVER_BISQ_ONION__}!g" mempool-config.json +# LIGHTNING +sed -i "s!__LIGHTNING_ENABLED__!${__LIGHTNING_ENABLED__}!g" mempool-config.json +sed -i "s!__LIGHTNING_BACKEND__!${__LIGHTNING_BACKEND__}!g" mempool-config.json +sed -i "s!__LIGHTNING_TOPOLOGY_FOLDER__!${__LIGHTNING_TOPOLOGY_FOLDER__}!g" mempool-config.json +sed -i "s!__LIGHTNING_STATS_REFRESH_INTERVAL__!${__LIGHTNING_STATS_REFRESH_INTERVAL__}!g" mempool-config.json +sed -i "s!__LIGHTNING_GRAPH_REFRESH_INTERVAL__!${__LIGHTNING_GRAPH_REFRESH_INTERVAL__}!g" mempool-config.json +sed -i "s!__LIGHTNING_LOGGER_UPDATE_INTERVAL__!${__LIGHTNING_LOGGER_UPDATE_INTERVAL__}!g" mempool-config.json + +# LND +sed -i "s!__LND_TLS_CERT_PATH__!${__LND_TLS_CERT_PATH__}!g" mempool-config.json +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 + node /backend/dist/index.js