From 3aa5ebdcd84a5e1aa00eff6436773a72cd17a58b Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 14:15:26 +0000 Subject: [PATCH 01/11] v19 tests --- src/tests/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/docker-compose.yml b/src/tests/docker-compose.yml index a7e435ad..ee5ad96b 100644 --- a/src/tests/docker-compose.yml +++ b/src/tests/docker-compose.yml @@ -27,7 +27,7 @@ services: USERID: ${USERID:-1000} GROUPID: ${GROUPID:-1000} stop_grace_period: 2m - image: polarlightning/lnd:0.18.3-beta + image: polarlightning/lnd:0.19.0-beta container_name: polar-n2-alice hostname: alice command: >- @@ -48,7 +48,7 @@ services: USERID: ${USERID:-1000} GROUPID: ${GROUPID:-1000} stop_grace_period: 2m - image: polarlightning/lnd:0.18.3-beta + image: polarlightning/lnd:0.19.0-beta container_name: polar-n2-bob hostname: bob command: >- @@ -69,7 +69,7 @@ services: USERID: ${USERID:-1000} GROUPID: ${GROUPID:-1000} stop_grace_period: 2m - image: polarlightning/lnd:0.18.3-beta + image: polarlightning/lnd:0.19.0-beta container_name: polar-n2-carol hostname: carol command: >- @@ -90,7 +90,7 @@ services: USERID: ${USERID:-1000} GROUPID: ${GROUPID:-1000} stop_grace_period: 2m - image: polarlightning/lnd:0.18.3-beta + image: polarlightning/lnd:0.19.0-beta container_name: polar-n2-dave hostname: dave command: >- From fdf95773ac4b3678fe46936b2933a0492f8b5a89 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 14:23:16 +0000 Subject: [PATCH 02/11] up --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed6d727b..2a897f42 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "clean": "rimraf build", "test": "npm run clean && tsc && node build/src/tests/testRunner.js", "start": "npm run clean && tsc && node build/src/index.js", - "start:ci": "git reset --hard && git pull && export NODE_TLS_REJECT_UNAUTHORIZED='0' && npm run start", + "start:ci": "git reset --hard && git pull && export NODE_TLS_REJECT_UNAUTHORIZED='0' && npm run start ", "gen": "cd proto && rimraf autogenerated && export PATH=$PATH:~/Lightning.Pub/proto && protoc -I ./service --pub_out=. service/*", "build_autogenerated": "cd proto && rimraf autogenerated && protoc -I ./service --pub_out=. service/*", "build_lnd_client_1": "cd proto && protoc -I ./others --plugin=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=./lnd --ts_proto_opt=esModuleInterop=true others/* ", From 4c5f1c880eb345b5f73b992ee92bc437f0f58baf Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 14:39:05 +0000 Subject: [PATCH 03/11] up --- src/tests/.env.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/.env.test b/src/tests/.env.test index ebc37838..9645d7a7 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -1,4 +1,4 @@ -LND_ADDRESS=127.0.0.1:10001 #alice +LND_ADDRESS=alice #alice LND_CERT_PATH=alice-tls.cert #alice LND_MACAROON_PATH=alice-admin.macaroon DATABASE_FILE=db.sqlite @@ -23,15 +23,15 @@ WATCHDOG_MAX_DIFF_BPS=100 WATCHDOG_MAX_DIFF_SATS=10000 # dave <--> alice <--> carol <--> bob -LND_OTHER_ADDR=127.0.0.1:10002 +LND_OTHER_ADDR=bob LND_OTHER_CERT_PATH=bob-tls.cert LND_OTHER_MACAROON_PATH=bob-admin.macaroon -LND_THIRD_ADDR=127.0.0.1:10003 +LND_THIRD_ADDR=carol LND_THIRD_CERT_PATH=carol-tls.cert LND_THIRD_MACAROON_PATH=carol-admin.macaroon -LND_FOURTH_ADDR=127.0.0.1:10004 +LND_FOURTH_ADDR=dave LND_FOURTH_CERT_PATH=dave-tls.cert LND_FOURTH_MACAROON_PATH=dave-admin.macaroon From 0fa569c0d5ef83e8c77df3789fedacaa98e25dc5 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 14:45:04 +0000 Subject: [PATCH 04/11] up --- src/tests/.env.test | 8 ++++---- src/tests/docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/.env.test b/src/tests/.env.test index 9645d7a7..ebc37838 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -1,4 +1,4 @@ -LND_ADDRESS=alice #alice +LND_ADDRESS=127.0.0.1:10001 #alice LND_CERT_PATH=alice-tls.cert #alice LND_MACAROON_PATH=alice-admin.macaroon DATABASE_FILE=db.sqlite @@ -23,15 +23,15 @@ WATCHDOG_MAX_DIFF_BPS=100 WATCHDOG_MAX_DIFF_SATS=10000 # dave <--> alice <--> carol <--> bob -LND_OTHER_ADDR=bob +LND_OTHER_ADDR=127.0.0.1:10002 LND_OTHER_CERT_PATH=bob-tls.cert LND_OTHER_MACAROON_PATH=bob-admin.macaroon -LND_THIRD_ADDR=carol +LND_THIRD_ADDR=127.0.0.1:10003 LND_THIRD_CERT_PATH=carol-tls.cert LND_THIRD_MACAROON_PATH=carol-admin.macaroon -LND_FOURTH_ADDR=dave +LND_FOURTH_ADDR=127.0.0.1:10004 LND_FOURTH_CERT_PATH=dave-tls.cert LND_FOURTH_MACAROON_PATH=dave-admin.macaroon diff --git a/src/tests/docker-compose.yml b/src/tests/docker-compose.yml index ee5ad96b..6b158886 100644 --- a/src/tests/docker-compose.yml +++ b/src/tests/docker-compose.yml @@ -52,7 +52,7 @@ services: container_name: polar-n2-bob hostname: bob command: >- - lnd --noseedbackup --trickledelay=5000 --alias=bob --externalip=bob --tlsextradomain=bob --tlsextradomain=polar-n2-bob --tlsextradomain=host.docker.internal --listen=0.0.0.0:9735 --rpclisten=0.0.0.0:10009 --restlisten=0.0.0.0:8080 --bitcoin.active --bitcoin.regtest --bitcoin.node=bitcoind --bitcoind.rpchost=polar-n2-backend1 --bitcoind.rpcuser=polaruser --bitcoind.rpcpass=polarpass --bitcoind.zmqpubrawblock=tcp://polar-n2-backend1:28334 --bitcoind.zmqpubrawtx=tcp://polar-n2-backend1:28335 + lnd --noseedbackup --trickledelay=5000 --alias=bob --externalip=bob --externalip=127.0.0.1 --tlsextradomain=bob --tlsextradomain=polar-n2-bob --tlsextradomain=host.docker.internal --listen=0.0.0.0:9735 --rpclisten=0.0.0.0:10009 --restlisten=0.0.0.0:8080 --bitcoin.active --bitcoin.regtest --bitcoin.node=bitcoind --bitcoind.rpchost=polar-n2-backend1 --bitcoind.rpcuser=polaruser --bitcoind.rpcpass=polarpass --bitcoind.zmqpubrawblock=tcp://polar-n2-backend1:28334 --bitcoind.zmqpubrawtx=tcp://polar-n2-backend1:28335 restart: always volumes: - ./volumes/lnd/bob:/home/lnd/.lnd From 8af8340037171102a7fa69a4d35967d0194f01a9 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 15:08:20 +0000 Subject: [PATCH 05/11] up --- src/tests/.env.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/.env.test b/src/tests/.env.test index ebc37838..a84ac6dd 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -1,4 +1,4 @@ -LND_ADDRESS=127.0.0.1:10001 #alice +LND_ADDRESS=alice:10001 #alice LND_CERT_PATH=alice-tls.cert #alice LND_MACAROON_PATH=alice-admin.macaroon DATABASE_FILE=db.sqlite @@ -23,15 +23,15 @@ WATCHDOG_MAX_DIFF_BPS=100 WATCHDOG_MAX_DIFF_SATS=10000 # dave <--> alice <--> carol <--> bob -LND_OTHER_ADDR=127.0.0.1:10002 +LND_OTHER_ADDR=bob:10002 LND_OTHER_CERT_PATH=bob-tls.cert LND_OTHER_MACAROON_PATH=bob-admin.macaroon -LND_THIRD_ADDR=127.0.0.1:10003 +LND_THIRD_ADDR=carol:10003 LND_THIRD_CERT_PATH=carol-tls.cert LND_THIRD_MACAROON_PATH=carol-admin.macaroon -LND_FOURTH_ADDR=127.0.0.1:10004 +LND_FOURTH_ADDR=dave:10004 LND_FOURTH_CERT_PATH=dave-tls.cert LND_FOURTH_MACAROON_PATH=dave-admin.macaroon From d4e36dc72473fe0d1163087c9503ad590d1dcaa3 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 15:10:52 +0000 Subject: [PATCH 06/11] up --- src/tests/.env.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/.env.test b/src/tests/.env.test index a84ac6dd..b3f41119 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -1,4 +1,4 @@ -LND_ADDRESS=alice:10001 #alice +LND_ADDRESS=polar-n2-alice:10001 #alice LND_CERT_PATH=alice-tls.cert #alice LND_MACAROON_PATH=alice-admin.macaroon DATABASE_FILE=db.sqlite @@ -23,15 +23,15 @@ WATCHDOG_MAX_DIFF_BPS=100 WATCHDOG_MAX_DIFF_SATS=10000 # dave <--> alice <--> carol <--> bob -LND_OTHER_ADDR=bob:10002 +LND_OTHER_ADDR=polar-n2-bob:10002 LND_OTHER_CERT_PATH=bob-tls.cert LND_OTHER_MACAROON_PATH=bob-admin.macaroon -LND_THIRD_ADDR=carol:10003 +LND_THIRD_ADDR=polar-n2-carol:10003 LND_THIRD_CERT_PATH=carol-tls.cert LND_THIRD_MACAROON_PATH=carol-admin.macaroon -LND_FOURTH_ADDR=dave:10004 +LND_FOURTH_ADDR=polar-n2-dave:10004 LND_FOURTH_CERT_PATH=dave-tls.cert LND_FOURTH_MACAROON_PATH=dave-admin.macaroon From 8abe3e5129a25da850d518609d6a973e1dcb8920 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 15:52:00 +0000 Subject: [PATCH 07/11] up --- src/services/lnd/lnd.ts | 6 +++++- src/tests/.env.test | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/services/lnd/lnd.ts b/src/services/lnd/lnd.ts index c638bb66..df038b32 100644 --- a/src/services/lnd/lnd.ts +++ b/src/services/lnd/lnd.ts @@ -64,7 +64,11 @@ export default class { sslCreds, macaroonCreds, ); - const transport = new GrpcTransport({ host: lndAddr, channelCredentials: creds }) + const transport = new GrpcTransport({ + host: lndAddr, channelCredentials: creds, clientOptions: { + //"grpc.ssl_target_name_override" + } + }) this.lightning = new LightningClient(transport) this.invoices = new InvoicesClient(transport) this.router = new RouterClient(transport) diff --git a/src/tests/.env.test b/src/tests/.env.test index b3f41119..32506758 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -1,4 +1,4 @@ -LND_ADDRESS=polar-n2-alice:10001 #alice +LND_ADDRESS=localhost:10001 #alice LND_CERT_PATH=alice-tls.cert #alice LND_MACAROON_PATH=alice-admin.macaroon DATABASE_FILE=db.sqlite @@ -23,15 +23,15 @@ WATCHDOG_MAX_DIFF_BPS=100 WATCHDOG_MAX_DIFF_SATS=10000 # dave <--> alice <--> carol <--> bob -LND_OTHER_ADDR=polar-n2-bob:10002 +LND_OTHER_ADDR=localhost:10002 LND_OTHER_CERT_PATH=bob-tls.cert LND_OTHER_MACAROON_PATH=bob-admin.macaroon -LND_THIRD_ADDR=polar-n2-carol:10003 +LND_THIRD_ADDR=localhost:10003 LND_THIRD_CERT_PATH=carol-tls.cert LND_THIRD_MACAROON_PATH=carol-admin.macaroon -LND_FOURTH_ADDR=polar-n2-dave:10004 +LND_FOURTH_ADDR=localhost:10004 LND_FOURTH_CERT_PATH=dave-tls.cert LND_FOURTH_MACAROON_PATH=dave-admin.macaroon From 410b431c8239e9b159b5c95b86506b797f28c4c7 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 15:54:42 +0000 Subject: [PATCH 08/11] fix --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2a897f42..91312709 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "main": "index.js", "scripts": { "clean": "rimraf build", - "test": "npm run clean && tsc && node build/src/tests/testRunner.js", + "test": "npm run clean && tsc && export NODE_TLS_REJECT_UNAUTHORIZED='0' && node build/src/tests/testRunner.js", "start": "npm run clean && tsc && node build/src/index.js", - "start:ci": "git reset --hard && git pull && export NODE_TLS_REJECT_UNAUTHORIZED='0' && npm run start ", + "start:ci": "git reset --hard && git pull && npm run start ", "gen": "cd proto && rimraf autogenerated && export PATH=$PATH:~/Lightning.Pub/proto && protoc -I ./service --pub_out=. service/*", "build_autogenerated": "cd proto && rimraf autogenerated && protoc -I ./service --pub_out=. service/*", "build_lnd_client_1": "cd proto && protoc -I ./others --plugin=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=./lnd --ts_proto_opt=esModuleInterop=true others/* ", From 2845fff366e0d830f4c0a1664c0c28dc97326366 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 15:57:18 +0000 Subject: [PATCH 09/11] up --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91312709..36412acd 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "clean": "rimraf build", "test": "npm run clean && tsc && export NODE_TLS_REJECT_UNAUTHORIZED='0' && node build/src/tests/testRunner.js", "start": "npm run clean && tsc && node build/src/index.js", - "start:ci": "git reset --hard && git pull && npm run start ", + "start:ci": "git reset --hard && git pull && npm run start", "gen": "cd proto && rimraf autogenerated && export PATH=$PATH:~/Lightning.Pub/proto && protoc -I ./service --pub_out=. service/*", "build_autogenerated": "cd proto && rimraf autogenerated && protoc -I ./service --pub_out=. service/*", "build_lnd_client_1": "cd proto && protoc -I ./others --plugin=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=./lnd --ts_proto_opt=esModuleInterop=true others/* ", From cbc4a0b418b8c566d2693a4ae9c73c789e35af8c Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 16:09:09 +0000 Subject: [PATCH 10/11] up --- src/tests/.env.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/.env.test b/src/tests/.env.test index 32506758..8d0e92e2 100644 --- a/src/tests/.env.test +++ b/src/tests/.env.test @@ -37,4 +37,4 @@ LND_FOURTH_MACAROON_PATH=dave-admin.macaroon BITCOIN_CORE_PORT=18443 BITCOIN_CORE_USER=polaruser -BITCOIN_CORE_PASS=polarpass \ No newline at end of file +BITCOIN_CORE_PASS=polarpass From 083ab9f371f2f20a3a031e7e96c126fccaab8616 Mon Sep 17 00:00:00 2001 From: boufni95 Date: Fri, 6 Jun 2025 16:14:15 +0000 Subject: [PATCH 11/11] up --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 59549acd..125652ac 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,7 +39,7 @@ jobs: with: # npm cache files are stored in `~/.npm` on Linux/macOS path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json', '*/package-lock.json') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build-