From 3edc722e426bfd4593a457f929bc219aa7ec4200 Mon Sep 17 00:00:00 2001 From: gruve-p Date: Mon, 6 Jan 2020 15:47:18 +0100 Subject: [PATCH] Bump GRS C-lightning and add GRS LND (#252) * Bump GRS lightning * Add GRS LND and bump grs lightning --- .../groestlcoin-clightning.yml | 2 +- .../docker-fragments/groestlcoin-lnd.yml | 71 +++++++++++++++++++ .../src/CryptoDefinition.cs | 3 +- groestlcoin-lncli.ps1 | 1 + groestlcoin-lncli.sh | 3 + 5 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 docker-compose-generator/docker-fragments/groestlcoin-lnd.yml create mode 100644 groestlcoin-lncli.ps1 create mode 100644 groestlcoin-lncli.sh diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 9b0f0da..9875c50 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.7.3 + image: groestlcoin/lightning:v0.8.0 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped diff --git a/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml b/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml new file mode 100644 index 0000000..871d8e0 --- /dev/null +++ b/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml @@ -0,0 +1,71 @@ +version: "3" + +services: + lnd_groestlcoin: + image: groestlcoin/lnd:v0.8.2-grs + container_name: btcpayserver_lnd_groestlcoin + restart: unless-stopped + environment: + LND_CHAIN: "grs" + LND_EXTERNALIP: ${BTCPAY_ANNOUNCEABLE_HOST} + LND_PORT: 9736 + LND_ALIAS: ${LIGHTNING_ALIAS} + LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}" + LND_EXTRA_ARGS: | + restlisten=0.0.0.0:8080 + rpclisten=127.0.0.1:10008 + rpclisten=0.0.0.0:10009 + groestlcoin.node=groestlcoind + groestlcoind.rpchost=groestlcoind:43782 + groestlcoind.zmqpubrawblock=tcp://groestlcoind:21441 + groestlcoind.zmqpubrawtx=tcp://groestlcoind:21441 + adminmacaroonpath=/data/admin.macaroon + invoicemacaroonpath=/data/invoice.macaroon + readonlymacaroonpath=/data/readonly.macaroon + notls=1 + ports: + - "9736:9736" + expose: + - "8080" + - "9736" + volumes: + - "lnd_groestlcoin_datadir:/data" + - "groestlcoin_datadir:/deps/.groestlcoin" + - "nbxplorer_datadir:/root/.nbxplorer" + links: + - groestlcoind + + btcpayserver: + environment: + BTCPAY_GRSLIGHTNING: "type=lnd-rest;server=http://lnd_groestlcoin:8080/;macaroonfilepath=/etc/lnd_groestlcoin/admin.macaroon;allowinsecure=true" + BTCPAY_GRSEXTERNALLNDGRPC: "server=/;macaroonfilepath=/etc/lnd_groestlcoin/admin.macaroon;macaroondirectorypath=/etc/lnd_groestlcoin" + BTCPAY_GRSEXTERNALLNDREST: "server=/lnd-rest/grs/;macaroonfilepath=/etc/lnd_groestlcoin/admin.macaroon;macaroondirectorypath=/etc/lnd_groestlcoin" + BTCPAY_GRSEXTERNALLNDSEEDBACKUP: "/etc/lnd_groestlcoin/data/chain/groestlcoin/${NBITCOIN_NETWORK:-regtest}/walletunlock.json" + volumes: + - "lnd_groestlcoin_datadir:/etc/lnd_groestlcoin" + links: + - lnd_groestlcoin + + groestlcoind: + environment: + BITCOIN_EXTRA_ARGS: | + zmqpubrawtx=tcp://0.0.0.0:21441 + zmqpubrawblock=tcp://0.0.0.0:21441 + zmqpubrawtxlock=tcp://0.0.0.0:21441 + zmqpubhashblock=tcp://0.0.0.0:21441 + expose: + - "21441" + + nginx: + links: + - "lnd_groestlcoin" + volumes: + - "lnd_groestlcoin_datadir:/lnd" + nginx-gen: + links: + - "lnd_groestlcoin" + volumes: + - "lnd_groestlcoin_datadir:/lnd" + +volumes: + lnd_groestlcoin_datadir: diff --git a/docker-compose-generator/src/CryptoDefinition.cs b/docker-compose-generator/src/CryptoDefinition.cs index 5804171..3f5d725 100644 --- a/docker-compose-generator/src/CryptoDefinition.cs +++ b/docker-compose-generator/src/CryptoDefinition.cs @@ -26,7 +26,7 @@ namespace DockerGenerator get; private set; } - + public string EclairFragment { get; @@ -73,6 +73,7 @@ namespace DockerGenerator Crypto = "grs", CryptoFragment = "groestlcoin", CLightningFragment = "groestlcoin-clightning", + LNDFragment = "groestlcoin-lnd" }, new CryptoDefinition() { diff --git a/groestlcoin-lncli.ps1 b/groestlcoin-lncli.ps1 new file mode 100644 index 0000000..2939a3c --- /dev/null +++ b/groestlcoin-lncli.ps1 @@ -0,0 +1 @@ +docker exec -ti btcpayserver_lnd_groestlcoin lncli $args diff --git a/groestlcoin-lncli.sh b/groestlcoin-lncli.sh new file mode 100644 index 0000000..3518da9 --- /dev/null +++ b/groestlcoin-lncli.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -ti btcpayserver_lnd_groestlcoin lncli "$@"