From c6e063ea2f58428b3d12c4496c12052a3d32de49 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Mon, 20 Mar 2023 16:35:44 +0900
Subject: [PATCH] Make lnd timeout configurable

---
 backend/mempool-config.sample.json                    | 3 ++-
 backend/src/__fixtures__/mempool-config.template.json | 3 ++-
 backend/src/api/lightning/lnd/lnd-api.ts              | 2 +-
 backend/src/config.ts                                 | 2 ++
 docker/README.md                                      | 4 +++-
 docker/backend/mempool-config.json                    | 3 ++-
 docker/backend/start.sh                               | 2 ++
 7 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json
index a1391c52b..9e941636e 100644
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -93,7 +93,8 @@
   "LND": {
     "TLS_CERT_PATH": "tls.cert",
     "MACAROON_PATH": "readonly.macaroon",
-    "REST_API_URL": "https://localhost:8080"
+    "REST_API_URL": "https://localhost:8080",
+    "TIMEOUT": 10000
   },
   "CLIGHTNING": {
     "SOCKET": "lightning-rpc"
diff --git a/backend/src/__fixtures__/mempool-config.template.json b/backend/src/__fixtures__/mempool-config.template.json
index 759781045..239c30547 100644
--- a/backend/src/__fixtures__/mempool-config.template.json
+++ b/backend/src/__fixtures__/mempool-config.template.json
@@ -109,7 +109,8 @@
   "LND": {
     "TLS_CERT_PATH": "",
     "MACAROON_PATH": "",
-    "REST_API_URL": "https://localhost:8080"
+    "REST_API_URL": "https://localhost:8080",
+    "TIMEOUT": 10000
   },
   "CLIGHTNING": {
     "SOCKET": "__CLIGHTNING_SOCKET__"
diff --git a/backend/src/api/lightning/lnd/lnd-api.ts b/backend/src/api/lightning/lnd/lnd-api.ts
index 1480f9b8f..31b868df9 100644
--- a/backend/src/api/lightning/lnd/lnd-api.ts
+++ b/backend/src/api/lightning/lnd/lnd-api.ts
@@ -17,7 +17,7 @@ class LndApi implements AbstractLightningApi {
         httpsAgent: new Agent({
           ca: fs.readFileSync(config.LND.TLS_CERT_PATH)
         }),
-        timeout: 10000
+        timeout: config.LND.TIMEOUT
       };
     }
   }
diff --git a/backend/src/config.ts b/backend/src/config.ts
index 6c17d7f81..a16b38af9 100644
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -51,6 +51,7 @@ interface IConfig {
     TLS_CERT_PATH: string;
     MACAROON_PATH: string;
     REST_API_URL: string;
+    TIMEOUT: number;
   };
   CLIGHTNING: {
     SOCKET: string;
@@ -218,6 +219,7 @@ const defaults: IConfig = {
     'TLS_CERT_PATH': '',
     'MACAROON_PATH': '',
     'REST_API_URL': 'https://localhost:8080',
+    'TIMEOUT': 10000,
   },
   'CLIGHTNING': {
     'SOCKET': '',
diff --git a/docker/README.md b/docker/README.md
index ea9ca5d51..1b9787842 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -172,7 +172,7 @@ Corresponding `docker-compose.yml` overrides:
       CORE_RPC_PORT: ""
       CORE_RPC_USERNAME: ""
       CORE_RPC_PASSWORD: ""
-      CORE_RPC_TIMEOUT: ""
+      CORE_RPC_TIMEOUT: 60000
       ...
 ```
 
@@ -408,6 +408,7 @@ Corresponding `docker-compose.yml` overrides:
     "TLS_CERT_PATH": ""
     "MACAROON_PATH": ""
     "REST_API_URL": "https://localhost:8080"
+    "TIMEOUT": 10000
   }
 ```
 
@@ -418,6 +419,7 @@ Corresponding `docker-compose.yml` overrides:
       LND_TLS_CERT_PATH: ""
       LND_MACAROON_PATH: ""
       LND_REST_API_URL: "https://localhost:8080"
+      LND_TIMEOUT: 10000
       ...
 ```
 
diff --git a/docker/backend/mempool-config.json b/docker/backend/mempool-config.json
index 915f0aac3..c1165a93a 100644
--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -85,7 +85,8 @@
   "LND": {
     "TLS_CERT_PATH": "__LND_TLS_CERT_PATH__",
     "MACAROON_PATH": "__LND_MACAROON_PATH__",
-    "REST_API_URL": "__LND_REST_API_URL__"
+    "REST_API_URL": "__LND_REST_API_URL__",
+    "TIMEOUT": "__LND_TIMEOUT__"
   },
   "CLIGHTNING": {
     "SOCKET": "__CLIGHTNING_SOCKET__"
diff --git a/docker/backend/start.sh b/docker/backend/start.sh
index f307b7111..3c963815c 100755
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -109,6 +109,7 @@ __LIGHTNING_LOGGER_UPDATE_INTERVAL__=${LIGHTNING_LOGGER_UPDATE_INTERVAL:=30}
 __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"}
+__LND_TIMEOUT__=${LND_TIMEOUT:=10000}
 
 # CLN
 __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""}
@@ -220,6 +221,7 @@ sed -i "s!__LIGHTNING_LOGGER_UPDATE_INTERVAL__!${__LIGHTNING_LOGGER_UPDATE_INTER
 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
+sed -i "s!__LND_TIMEOUT__!${__LND_TIMEOUT__}!g" mempool-config.json
 
 # CLN
 sed -i "s!__CLIGHTNING_SOCKET__!${__CLIGHTNING_SOCKET__}!g" mempool-config.json