From 52f1f0fa3cee6aa82d2631ec13162f8234519997 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Tue, 4 Dec 2018 08:23:04 +0100 Subject: [PATCH 01/26] start c-lightning integration for grs --- .../groestlcoin-clightning.yml | 38 +++++++++++++++++++ .../src/CryptoDefinition.cs | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 docker-compose-generator/docker-fragments/groestlcoin-clightning.yml diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml new file mode 100644 index 0000000..072b4a7 --- /dev/null +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -0,0 +1,38 @@ +version: "3" + +services: + clightning_groestlcoin: + image: kukks/grs-clightning:latest + stop_signal: SIGKILL + container_name: btcpayserver_clightning_groestlcoin + restart: unless-stopped + environment: + LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} + LIGHTNINGD_CHAIN: grs + LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" + LIGHTNINGD_OPT: | + bitcoin-datadir=/etc/groestlcoin + bitcoin-rpcconnect=groestlcoind + announce-addr=${BTCPAY_HOST}:9737 + bind-addr=0.0.0.0:9735 + network=${NBITCOIN_NETWORK:-regtest} + alias=${LIGHTNING_ALIAS} + chain=grs + volumes: + - "clightning_bitcoin_datadir:/root/.lightning" + - "bitcoin_datadir:/etc/bitcoin" + - "nbxplorer_datadir:/root/.nbxplorer" + ports: + - "9737:9737" + links: + - nbxplorer + - groestlcoind + btcpayserver: + environment: + BTCPAY_GRSLIGHTNING: "type=clightning;server=unix://etc/clightning_groestlcoin/lightning-rpc" + volumes: + - "clightning_groestlcoin_datadir:/etc/clightning_groestlcoin" + links: + - clightning_groestlcoin +volumes: + clightning_groestlcoin_datadir: \ No newline at end of file diff --git a/docker-compose-generator/src/CryptoDefinition.cs b/docker-compose-generator/src/CryptoDefinition.cs index 4e6f387..ef99dea 100644 --- a/docker-compose-generator/src/CryptoDefinition.cs +++ b/docker-compose-generator/src/CryptoDefinition.cs @@ -64,7 +64,8 @@ namespace DockerGenerator new CryptoDefinition() { Crypto = "grs", - CryptoFragment = "groestlcoin" + CryptoFragment = "groestlcoin", + CLightningFragment = "groestlcoin-clightning", }, new CryptoDefinition() { From 8c469bdea4542dbe688ab429cbed80acf09720f9 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Tue, 4 Dec 2018 08:26:54 +0100 Subject: [PATCH 02/26] correct docker fragment --- .../docker-fragments/groestlcoin-clightning.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 072b4a7..e9d014a 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -14,13 +14,13 @@ services: bitcoin-datadir=/etc/groestlcoin bitcoin-rpcconnect=groestlcoind announce-addr=${BTCPAY_HOST}:9737 - bind-addr=0.0.0.0:9735 + bind-addr=0.0.0.0:9737 network=${NBITCOIN_NETWORK:-regtest} alias=${LIGHTNING_ALIAS} chain=grs volumes: - - "clightning_bitcoin_datadir:/root/.lightning" - - "bitcoin_datadir:/etc/bitcoin" + - "clightning_groestlcoin_datadir:/root/.lightning" + - "bitcoin_datadir:/etc/groestlcoin" - "nbxplorer_datadir:/root/.nbxplorer" ports: - "9737:9737" From 5e08c4809634ff74fe6f15ae8eb8c170811454b9 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 6 Dec 2018 13:34:15 +0100 Subject: [PATCH 03/26] add grs lightning cli --- groestlcoin-lightning-cli.ps1 | 1 + groestlcoin-lightning-cli.sh | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 groestlcoin-lightning-cli.ps1 create mode 100644 groestlcoin-lightning-cli.sh diff --git a/groestlcoin-lightning-cli.ps1 b/groestlcoin-lightning-cli.ps1 new file mode 100644 index 0000000..5c7e2e1 --- /dev/null +++ b/groestlcoin-lightning-cli.ps1 @@ -0,0 +1 @@ +docker exec -ti btcpayserver_clightning_groestlcoin lightning-cli $args diff --git a/groestlcoin-lightning-cli.sh b/groestlcoin-lightning-cli.sh new file mode 100644 index 0000000..ceb9947 --- /dev/null +++ b/groestlcoin-lightning-cli.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -ti btcpayserver_clightning_groestlcoin lightning-cli "$@" From cf1fdb5a7e70392ed016b8123bf864c2b03f9fe1 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 7 Dec 2018 10:00:47 +0100 Subject: [PATCH 04/26] Update groestlcoin-clightning.yml --- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index e9d014a..a7ade5e 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -20,7 +20,7 @@ services: chain=grs volumes: - "clightning_groestlcoin_datadir:/root/.lightning" - - "bitcoin_datadir:/etc/groestlcoin" + - "groestlcoin_datadir:/etc/groestlcoin" - "nbxplorer_datadir:/root/.nbxplorer" ports: - "9737:9737" @@ -35,4 +35,4 @@ services: links: - clightning_groestlcoin volumes: - clightning_groestlcoin_datadir: \ No newline at end of file + clightning_groestlcoin_datadir: From 8d7eac670a125598bff50522a2670d59f878c524 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 7 Dec 2018 13:53:09 +0100 Subject: [PATCH 05/26] add debug log --- .../docker-fragments/groestlcoin-clightning.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index a7ade5e..5e6f56b 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -13,6 +13,7 @@ services: LIGHTNINGD_OPT: | bitcoin-datadir=/etc/groestlcoin bitcoin-rpcconnect=groestlcoind + log-level=debug announce-addr=${BTCPAY_HOST}:9737 bind-addr=0.0.0.0:9737 network=${NBITCOIN_NETWORK:-regtest} From 322565e6fae1089c2b18580637acbe24d63cd62e Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 7 Dec 2018 13:55:10 +0100 Subject: [PATCH 06/26] speicfy port --- .../docker-fragments/groestlcoin-clightning.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 5e6f56b..6be8451 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -13,9 +13,11 @@ services: LIGHTNINGD_OPT: | bitcoin-datadir=/etc/groestlcoin bitcoin-rpcconnect=groestlcoind + bitcoin-rpcport=43782 log-level=debug announce-addr=${BTCPAY_HOST}:9737 bind-addr=0.0.0.0:9737 + network=${NBITCOIN_NETWORK:-regtest} alias=${LIGHTNING_ALIAS} chain=grs From 594597c580ca86e4c2ff62d4e872105c0811d5ad Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Fri, 7 Dec 2018 14:16:35 +0100 Subject: [PATCH 07/26] change ports --- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 6be8451..722d057 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -16,7 +16,7 @@ services: bitcoin-rpcport=43782 log-level=debug announce-addr=${BTCPAY_HOST}:9737 - bind-addr=0.0.0.0:9737 + bind-addr=0.0.0.0:9735 network=${NBITCOIN_NETWORK:-regtest} alias=${LIGHTNING_ALIAS} @@ -26,7 +26,7 @@ services: - "groestlcoin_datadir:/etc/groestlcoin" - "nbxplorer_datadir:/root/.nbxplorer" ports: - - "9737:9737" + - "9737:9735" links: - nbxplorer - groestlcoind From 0e6d9418036796522e91813abf35cc0d97a846ac Mon Sep 17 00:00:00 2001 From: Kukks Date: Mon, 10 Dec 2018 13:52:06 +0100 Subject: [PATCH 08/26] remove chain option --- .../docker-fragments/groestlcoin-clightning.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 722d057..e37d898 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -17,10 +17,8 @@ services: log-level=debug announce-addr=${BTCPAY_HOST}:9737 bind-addr=0.0.0.0:9735 - network=${NBITCOIN_NETWORK:-regtest} alias=${LIGHTNING_ALIAS} - chain=grs volumes: - "clightning_groestlcoin_datadir:/root/.lightning" - "groestlcoin_datadir:/etc/groestlcoin" From 52270cbb6f53bb645dcdbfda6524f21fb5e4c86c Mon Sep 17 00:00:00 2001 From: Kukks Date: Tue, 11 Dec 2018 22:11:05 +0100 Subject: [PATCH 09/26] bump lightning to official package --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index e37d898..fb5e9d6 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: kukks/grs-clightning:latest + image: kukksgroestlcoin/lightning:v0.6.2-1 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped From d5f20b5d6d4e8502a47a3aa7095546d264b98547 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Wed, 12 Dec 2018 11:08:48 +0100 Subject: [PATCH 10/26] change port --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index fb5e9d6..e7d0e67 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -24,7 +24,7 @@ services: - "groestlcoin_datadir:/etc/groestlcoin" - "nbxplorer_datadir:/root/.nbxplorer" ports: - - "9737:9735" + - "9738:9735" links: - nbxplorer - groestlcoind From d840d69ddb136f7640bc6748b4bc9ec275c0ec21 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Wed, 12 Dec 2018 11:17:09 +0100 Subject: [PATCH 11/26] add grs spark support --- Production/nginx.tmpl | 5 +++++ .../docker-fragments/groestlcoin-clightning.yml | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 8691739..90d6a60 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -323,6 +323,11 @@ server { proxy_pass http://clightning_bitcoin_spark:9737/; } {{ end }} + {{ if (eq $serviceName "clightning_groestlcoin_spark") }} + location /spark/btc/ { + proxy_pass http://clightning_groestlcoin_spark:9739/; + } + {{ end }} {{ end }} } diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index e7d0e67..2ed3047 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -31,9 +31,26 @@ services: btcpayserver: environment: BTCPAY_GRSLIGHTNING: "type=clightning;server=unix://etc/clightning_groestlcoin/lightning-rpc" + BTCPAY_GRSEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/grs;cookiefile=/etc/clightning_groestlcoin_spark/.cookie" volumes: - "clightning_groestlcoin_datadir:/etc/clightning_groestlcoin" + - "clightning_groestlcoin_spark:/etc/groestlcoin_spark" links: - clightning_groestlcoin + clightning_groestlcoin_spark: + image: shesek/spark-wallet:0.2.0-WIP + stop_signal: SIGKILL + restart: unless-stopped + environment: + NETWORK: ${NBITCOIN_NETWORK:-regtest} + SPARK_OPT: --no-tls -C /data/.cookie + volumes: + - "clightning_groestlcoin_datadir:/etc/lightning" + - "clightning_groestlcoin_spark:/data" + links: + - clightning_groestlcoin + expose: + - "9739" volumes: clightning_groestlcoin_datadir: + clightning_groestlcoin_spark: From 6f9ee3261309b2585677b342ed99ddc01f776793 Mon Sep 17 00:00:00 2001 From: Kukks Date: Tue, 11 Dec 2018 22:11:05 +0100 Subject: [PATCH 12/26] Revert "bump lightning to official package" This reverts commit 52270cbb6f53bb645dcdbfda6524f21fb5e4c86c. --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 2ed3047..b89efb1 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: kukksgroestlcoin/lightning:v0.6.2-1 + image: kukks/grs-clightning:latest stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped From 7ebd1259516d46c9a495184bd85b8d527edf5af6 Mon Sep 17 00:00:00 2001 From: Kukks Date: Wed, 12 Dec 2018 21:56:21 +0100 Subject: [PATCH 13/26] fix announcements --- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index b89efb1..89aee43 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -15,7 +15,7 @@ services: bitcoin-rpcconnect=groestlcoind bitcoin-rpcport=43782 log-level=debug - announce-addr=${BTCPAY_HOST}:9737 + announce-addr=${BTCPAY_HOST}:9738 bind-addr=0.0.0.0:9735 network=${NBITCOIN_NETWORK:-regtest} alias=${LIGHTNING_ALIAS} @@ -50,7 +50,7 @@ services: links: - clightning_groestlcoin expose: - - "9739" + - "9739:9737" volumes: clightning_groestlcoin_datadir: clightning_groestlcoin_spark: From 17021a4345dad9747b41490e9b88c86944aa4874 Mon Sep 17 00:00:00 2001 From: Kukks Date: Wed, 12 Dec 2018 22:01:33 +0100 Subject: [PATCH 14/26] fix spark --- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 89aee43..18f431c 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -43,14 +43,14 @@ services: restart: unless-stopped environment: NETWORK: ${NBITCOIN_NETWORK:-regtest} - SPARK_OPT: --no-tls -C /data/.cookie + SPARK_OPT: --no-tls -C /data/.cookie --port 9739 volumes: - "clightning_groestlcoin_datadir:/etc/lightning" - "clightning_groestlcoin_spark:/data" links: - clightning_groestlcoin expose: - - "9739:9737" + - "9739" volumes: clightning_groestlcoin_datadir: clightning_groestlcoin_spark: From d039aa05c478a20c4d51db586650e162c59642fb Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 13 Dec 2018 13:57:22 +0100 Subject: [PATCH 15/26] fix spark --- Production/nginx.tmpl | 2 +- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 90d6a60..ad7859f 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -324,7 +324,7 @@ server { } {{ end }} {{ if (eq $serviceName "clightning_groestlcoin_spark") }} - location /spark/btc/ { + location /spark/grs/ { proxy_pass http://clightning_groestlcoin_spark:9739/; } {{ end }} diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 18f431c..5a64444 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -43,7 +43,7 @@ services: restart: unless-stopped environment: NETWORK: ${NBITCOIN_NETWORK:-regtest} - SPARK_OPT: --no-tls -C /data/.cookie --port 9739 + SPARK_OPT: --no-tls --port 9739 -C /data/.cookie volumes: - "clightning_groestlcoin_datadir:/etc/lightning" - "clightning_groestlcoin_spark:/data" From 71900ab9d940f84022fba185982b55267042ef21 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 13 Dec 2018 14:19:43 +0100 Subject: [PATCH 16/26] fix spark numero due --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 5a64444..266ae6b 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -34,7 +34,7 @@ services: BTCPAY_GRSEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/grs;cookiefile=/etc/clightning_groestlcoin_spark/.cookie" volumes: - "clightning_groestlcoin_datadir:/etc/clightning_groestlcoin" - - "clightning_groestlcoin_spark:/etc/groestlcoin_spark" + - "clightning_groestlcoin_spark:/etc/clightning_groestlcoin_spark" links: - clightning_groestlcoin clightning_groestlcoin_spark: From afbcda4a50c00f57ef34116411ae8ff4ee23f060 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 13 Dec 2018 16:05:20 +0100 Subject: [PATCH 17/26] update image --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 266ae6b..cfa7fb7 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: kukks/grs-clightning:latest + image: groestlcoin/lightning:v0.6.2-2 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped From 4cdd664a3b3287f044e72105838d92706361aaeb Mon Sep 17 00:00:00 2001 From: Kukks Date: Wed, 19 Dec 2018 11:19:48 +0100 Subject: [PATCH 18/26] switch to latest --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index cfa7fb7..d9949b9 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v0.6.2-2 + image: groestlcoin/lightning:latest stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped From be46979513a8b8c173a00d7526ce5eeed48f4ef9 Mon Sep 17 00:00:00 2001 From: Kukks Date: Wed, 19 Dec 2018 11:29:50 +0100 Subject: [PATCH 19/26] use grs spark --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index d9949b9..d653efc 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -38,7 +38,7 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: shesek/spark-wallet:0.2.0-WIP + image: groestlcoin/spark-wallet:latest stop_signal: SIGKILL restart: unless-stopped environment: From 0da9fc0cbd4a2814cc49f64aca5e247490cff867 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 20 Dec 2018 11:22:07 +0100 Subject: [PATCH 20/26] update tags --- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index cfa7fb7..53b1ff5 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v0.6.2-2 + image: groestlcoin/lightning:v0.6.2 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped @@ -38,7 +38,7 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: shesek/spark-wallet:0.2.0-WIP + image: groestlcoin/spark-wallet:v0.2.1 stop_signal: SIGKILL restart: unless-stopped environment: From 8a716e8fc74f679aabbfb9dca8c48cb8780a1085 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 20 Dec 2018 15:52:49 +0100 Subject: [PATCH 21/26] bump grs lightning --- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 53b1ff5..dc8dc6b 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v0.6.2 + image: groestlcoin/lightning:v0.6.2-1 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped @@ -38,7 +38,7 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: groestlcoin/spark-wallet:v0.2.1 + image: groestlcoin/spark-wallet:v0.2.1-1 stop_signal: SIGKILL restart: unless-stopped environment: From 508759e0396fc1f35296c4e14fffc41bc0f967e4 Mon Sep 17 00:00:00 2001 From: Andrew Camilleri Date: Thu, 20 Dec 2018 16:05:38 +0100 Subject: [PATCH 22/26] bump grs --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index dc8dc6b..dba302a 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v0.6.2-1 + image: groestlcoin/lightning:v0.6.2-2 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped From 051f814800c0b5b637b66543f8e494226f45004f Mon Sep 17 00:00:00 2001 From: Kukks Date: Thu, 27 Dec 2018 12:25:31 +0100 Subject: [PATCH 23/26] add grs lightning charge --- Production/nginx.tmpl | 8 +++++++- .../groestlcoin-clightning.yml | 19 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index bc3b1dc..c1b5066 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -331,7 +331,13 @@ server { location /spark/grs/ { proxy_pass http://clightning_groestlcoin_spark:9739/; } - {{ end }} + {{ end }} + {{ if (eq $serviceName "clightning_groestlcoin_charge") }} + location /lightning-charge/btc/ { + proxy_pass http://clightning_groestlcoin_charge:9112/; + } + + {{ end }} } diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index dba302a..c38c1ed 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -28,17 +28,33 @@ services: links: - nbxplorer - groestlcoind + clightning_groestlcoin_charge: + image: groestlcoin/groestlcoin-lightning-charge:version-0.4.6 + restart: unless-stopped + environment: + NETWORK: ${NBITCOIN_NETWORK:-regtest} + COOKIE_FILE: /data/.cookie + URL: ${BTCPAY_ROOTPATH:-/}lightning-charge/grs/ + volumes: + - "clightning_groestlcoin_datadir:/etc/lightning" + - "clightning_groestlcoin_charge:/data" + expose: + - "9112" + links: + - clightning_groestlcoin btcpayserver: environment: BTCPAY_GRSLIGHTNING: "type=clightning;server=unix://etc/clightning_groestlcoin/lightning-rpc" BTCPAY_GRSEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/grs;cookiefile=/etc/clightning_groestlcoin_spark/.cookie" + BTCPAY_BTCEXTERNALCHARGE: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}lightning-charge/grs/;cookiefilepath=/etc/clightning_groestlcoin_charge/.cookie" volumes: - "clightning_groestlcoin_datadir:/etc/clightning_groestlcoin" - "clightning_groestlcoin_spark:/etc/clightning_groestlcoin_spark" + - "clightning_groestlcoin_charge:/etc/clightning_groestlcoin_charge" links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: groestlcoin/spark-wallet:v0.2.1-1 + image: groestlcoin/spark-wallet:v0.2.1-2 stop_signal: SIGKILL restart: unless-stopped environment: @@ -53,4 +69,5 @@ services: - "9739" volumes: clightning_groestlcoin_datadir: + clightning_groestlcoin_charge: clightning_groestlcoin_spark: From 4002cd561f85469e8a4b479efa60da880468b19d Mon Sep 17 00:00:00 2001 From: Kukks Date: Thu, 27 Dec 2018 12:38:22 +0100 Subject: [PATCH 24/26] fixes --- Production/nginx.tmpl | 2 +- .../docker-fragments/groestlcoin-clightning.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index c1b5066..09ac8f0 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -333,7 +333,7 @@ server { } {{ end }} {{ if (eq $serviceName "clightning_groestlcoin_charge") }} - location /lightning-charge/btc/ { + location /lightning-charge/grs/ { proxy_pass http://clightning_groestlcoin_charge:9112/; } diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index c38c1ed..92735b1 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -46,7 +46,7 @@ services: environment: BTCPAY_GRSLIGHTNING: "type=clightning;server=unix://etc/clightning_groestlcoin/lightning-rpc" BTCPAY_GRSEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/grs;cookiefile=/etc/clightning_groestlcoin_spark/.cookie" - BTCPAY_BTCEXTERNALCHARGE: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}lightning-charge/grs/;cookiefilepath=/etc/clightning_groestlcoin_charge/.cookie" + BTCPAY_GRSEXTERNALCHARGE: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}lightning-charge/grs/;cookiefilepath=/etc/clightning_groestlcoin_charge/.cookie" volumes: - "clightning_groestlcoin_datadir:/etc/clightning_groestlcoin" - "clightning_groestlcoin_spark:/etc/clightning_groestlcoin_spark" @@ -54,7 +54,7 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: groestlcoin/spark-wallet:v0.2.1-2 + image: groestlcoin/spark-wallet:v0.2.2 stop_signal: SIGKILL restart: unless-stopped environment: From 81f7f08cc496fed5ad809a08a9a6ed25b4b63c9a Mon Sep 17 00:00:00 2001 From: Kukks Date: Thu, 27 Dec 2018 12:39:05 +0100 Subject: [PATCH 25/26] fixes --- .../docker-fragments/groestlcoin-clightning.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 92735b1..8411328 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -54,7 +54,7 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: groestlcoin/spark-wallet:v0.2.2 + image: groestlcoin/spark-wallet:version-0.2.2 stop_signal: SIGKILL restart: unless-stopped environment: From c42ed65a26f0b91a3ffa439ad4b190265edb7399 Mon Sep 17 00:00:00 2001 From: Kukks Date: Fri, 28 Dec 2018 09:47:56 +0100 Subject: [PATCH 26/26] fixes fixes --- Production/nginx.tmpl | 1 + .../docker-fragments/groestlcoin-clightning.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 09ac8f0..1c99182 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -336,6 +336,7 @@ server { location /lightning-charge/grs/ { proxy_pass http://clightning_groestlcoin_charge:9112/; } + {{ end }} {{ end }} diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 8411328..62ee3cb 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -54,7 +54,7 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: groestlcoin/spark-wallet:version-0.2.2 + image: groestlcoin/groestlcoin-spark:version-0.2.2 stop_signal: SIGKILL restart: unless-stopped environment: