From 65a0c6a4b342f7578b48d9adfa23a7af2a437130 Mon Sep 17 00:00:00 2001 From: rockstardev Date: Mon, 1 Feb 2021 00:55:13 -0600 Subject: [PATCH 1/3] Updating development LND to v0.12.0-beta --- BTCPayServer.Tests/ServerTester.cs | 2 +- BTCPayServer.Tests/docker-compose.yml | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/BTCPayServer.Tests/ServerTester.cs b/BTCPayServer.Tests/ServerTester.cs index 69e8d497f..c1826daa0 100644 --- a/BTCPayServer.Tests/ServerTester.cs +++ b/BTCPayServer.Tests/ServerTester.cs @@ -91,7 +91,7 @@ namespace BTCPayServer.Tests CustomerLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30992/"), btc); MerchantLightningD = LightningClientFactory.CreateClient(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30993/"), btc); MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify;allowinsecure=true", "merchant_lightningd", btc); - MerchantLnd = new LndMockTester(this, "TEST_MERCHANTLND", "https://lnd:lnd@127.0.0.1:35531/", "merchant_lnd", btc); + MerchantLnd = new LndMockTester(this, "TEST_MERCHANTLND", "http://lnd:lnd@127.0.0.1:35531/", "merchant_lnd", btc); PayTester.UseLightning = true; PayTester.IntegratedLightning = MerchantCharge.Client.Uri; } diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index 9d729e884..be606c67a 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -213,18 +213,21 @@ services: - "5432" merchant_lnd: - image: btcpayserver/lnd:v0.11.0-beta + image: btcpayserver/lnd:v0.12.0-beta restart: unless-stopped environment: LND_CHAIN: "btc" LND_ENVIRONMENT: "regtest" LND_EXPLORERURL: "http://nbxplorer:32838/" + LND_REST_LISTEN_HOST: http://merchant_lnd:8080 LND_EXTRA_ARGS: | - restlisten=0.0.0.0:8080 + restlisten=merchant_lnd:8080 rpclisten=127.0.0.1:10008 - rpclisten=0.0.0.0:10009 + rpclisten=merchant_lnd:10009 bitcoin.node=bitcoind bitcoind.rpchost=bitcoind:43782 + bitcoind.rpcuser=ceiwHEbqWI83 + bitcoind.rpcpass=DwubwWsoo3 bitcoind.zmqpubrawblock=tcp://bitcoind:28332 bitcoind.zmqpubrawtx=tcp://bitcoind:28333 externalip=merchant_lnd:9735 @@ -232,6 +235,7 @@ services: no-macaroons=1 debuglevel=debug trickledelay=1000 + no-rest-tls=1 ports: - "35531:8080" expose: @@ -243,18 +247,21 @@ services: - bitcoind customer_lnd: - image: btcpayserver/lnd:v0.11.0-beta + image: btcpayserver/lnd:v0.12.0-beta restart: unless-stopped environment: LND_CHAIN: "btc" LND_ENVIRONMENT: "regtest" LND_EXPLORERURL: "http://nbxplorer:32838/" + LND_REST_LISTEN_HOST: http://customer_lnd:8080 LND_EXTRA_ARGS: | - restlisten=0.0.0.0:8080 + restlisten=customer_lnd:8080 rpclisten=127.0.0.1:10008 - rpclisten=0.0.0.0:10009 + rpclisten=customer_lnd:10009 bitcoin.node=bitcoind bitcoind.rpchost=bitcoind:43782 + bitcoind.rpcuser=ceiwHEbqWI83 + bitcoind.rpcpass=DwubwWsoo3 bitcoind.zmqpubrawblock=tcp://bitcoind:28332 bitcoind.zmqpubrawtx=tcp://bitcoind:28333 externalip=customer_lnd:10009 @@ -262,6 +269,7 @@ services: no-macaroons=1 debuglevel=debug trickledelay=1000 + no-rest-tls=1 ports: - "35532:8080" expose: From b21353c4f92fb58b599fee189ebdf32a98ad9b14 Mon Sep 17 00:00:00 2001 From: rockstardev Date: Mon, 1 Feb 2021 01:03:19 -0600 Subject: [PATCH 2/3] Updating LND in altcoins docker file as well --- .../docker-compose.altcoins.yml | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/BTCPayServer.Tests/docker-compose.altcoins.yml b/BTCPayServer.Tests/docker-compose.altcoins.yml index 13c159964..68d5d934b 100644 --- a/BTCPayServer.Tests/docker-compose.altcoins.yml +++ b/BTCPayServer.Tests/docker-compose.altcoins.yml @@ -225,18 +225,21 @@ services: - "5432" merchant_lnd: - image: btcpayserver/lnd:v0.11.0-beta + image: btcpayserver/lnd:v0.12.0-beta restart: unless-stopped environment: LND_CHAIN: "btc" LND_ENVIRONMENT: "regtest" LND_EXPLORERURL: "http://nbxplorer:32838/" + LND_REST_LISTEN_HOST: http://merchant_lnd:8080 LND_EXTRA_ARGS: | - restlisten=0.0.0.0:8080 + restlisten=merchant_lnd:8080 rpclisten=127.0.0.1:10008 - rpclisten=0.0.0.0:10009 + rpclisten=merchant_lnd:10009 bitcoin.node=bitcoind bitcoind.rpchost=bitcoind:43782 + bitcoind.rpcuser=ceiwHEbqWI83 + bitcoind.rpcpass=DwubwWsoo3 bitcoind.zmqpubrawblock=tcp://bitcoind:28332 bitcoind.zmqpubrawtx=tcp://bitcoind:28333 externalip=merchant_lnd:9735 @@ -244,6 +247,7 @@ services: no-macaroons=1 debuglevel=debug trickledelay=1000 + no-rest-tls=1 ports: - "35531:8080" expose: @@ -255,18 +259,21 @@ services: - bitcoind customer_lnd: - image: btcpayserver/lnd:v0.11.0-beta + image: btcpayserver/lnd:v0.12.0-beta restart: unless-stopped environment: LND_CHAIN: "btc" LND_ENVIRONMENT: "regtest" LND_EXPLORERURL: "http://nbxplorer:32838/" + LND_REST_LISTEN_HOST: http://customer_lnd:8080 LND_EXTRA_ARGS: | - restlisten=0.0.0.0:8080 + restlisten=customer_lnd:8080 rpclisten=127.0.0.1:10008 - rpclisten=0.0.0.0:10009 + rpclisten=customer_lnd:10009 bitcoin.node=bitcoind bitcoind.rpchost=bitcoind:43782 + bitcoind.rpcuser=ceiwHEbqWI83 + bitcoind.rpcpass=DwubwWsoo3 bitcoind.zmqpubrawblock=tcp://bitcoind:28332 bitcoind.zmqpubrawtx=tcp://bitcoind:28333 externalip=customer_lnd:10009 @@ -274,6 +281,7 @@ services: no-macaroons=1 debuglevel=debug trickledelay=1000 + no-rest-tls=1 ports: - "35532:8080" expose: From 52881984745dd35a53f7b7988412bb2f5462d78f Mon Sep 17 00:00:00 2001 From: rockstardev Date: Mon, 1 Feb 2021 01:37:58 -0600 Subject: [PATCH 3/3] Updating connection to merchant_lnd for tests --- BTCPayServer.Tests/docker-compose.altcoins.yml | 2 +- BTCPayServer.Tests/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BTCPayServer.Tests/docker-compose.altcoins.yml b/BTCPayServer.Tests/docker-compose.altcoins.yml index 68d5d934b..bc935c821 100644 --- a/BTCPayServer.Tests/docker-compose.altcoins.yml +++ b/BTCPayServer.Tests/docker-compose.altcoins.yml @@ -24,7 +24,7 @@ services: TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc" TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc" TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true" - TEST_MERCHANTLND: "https://lnd:lnd@merchant_lnd:8080/" + TEST_MERCHANTLND: "http://lnd:lnd@merchant_lnd:8080/" TESTS_INCONTAINER: "true" TESTS_SSHCONNECTION: "root@sshd:22" TESTS_SSHPASSWORD: "" diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index be606c67a..bae13e519 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -22,7 +22,7 @@ services: TEST_MERCHANTLIGHTNINGD: "type=clightning;server=unix://etc/merchant_lightningd_datadir/lightning-rpc" TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=unix://etc/customer_lightningd_datadir/lightning-rpc" TEST_MERCHANTCHARGE: "type=charge;server=http://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true" - TEST_MERCHANTLND: "https://lnd:lnd@merchant_lnd:8080/" + TEST_MERCHANTLND: "http://lnd:lnd@merchant_lnd:8080/" TESTS_INCONTAINER: "true" TESTS_SSHCONNECTION: "root@sshd:22" TESTS_SSHPASSWORD: ""