Several GRS updates & bump to 22.0 (#539)

README.md

@@ -369,7 +369,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | groestlcoin/groestlcoin-spark | version-0.2.16 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) |
 | groestlcoin/eclair | v0.6.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.6.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) |
 | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) |
-| groestlcoin/docker-groestlcoin | 2.21.1 | [✔️](https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/docker-groestlcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) |
+| btcpayserver/groestlcoin | 22.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/22.0/Groestlcoin/22.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/22.0/Groestlcoin/22.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/22.0/Groestlcoin/22.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/groestlcoin) |
 | btcpayserver/elements | 0.21.0.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.1/Elements/0.21.0.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.1/Elements/0.21.0.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.1/Elements/0.21.0.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) |
 | btcpayserver/litecoin | 0.18.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1-1/Litecoin/0.18.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1-1/Litecoin/0.18.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.18.1-1/Litecoin/0.18.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) |
 | wakiyamap/docker-monacoin | 0.20.2 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.20.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) |

contrib/build-all-images.sh

@@ -357,15 +357,19 @@ docker build -f "$DOCKERFILE" -t "groestlcoin/lnd:v0.10.0-grs" .
 cd - && cd ..
 
 
-# Build docker-groestlcoin
+# Build groestlcoin
-# https://raw.githubusercontent.com/Groestlcoin/docker-groestlcoin/master/groestlcoin/2.21.1/Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/22.0/Groestlcoin/22.0/linuxamd64.Dockerfile
-DOCKERFILE="groestlcoin/2.21.1/Dockerfile"
+DOCKERFILE="Groestlcoin/22.0/linuxamd64.Dockerfile"
-echo "Building groestlcoin/docker-groestlcoin:2.21.1"
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/22.0/Groestlcoin/22.0/linuxarm32v7.Dockerfile
-git clone https://github.com/Groestlcoin/docker-groestlcoin docker-groestlcoin
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Groestlcoin/22.0/linuxarm32v7.Dockerfile"
-cd docker-groestlcoin
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Groestlcoin/22.0/Groestlcoin/22.0/linuxarm64v8.Dockerfile
-git checkout master
+[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Groestlcoin/22.0/linuxarm64v8.Dockerfile"
+echo "Building btcpayserver/groestlcoin:22.0"
+git clone https://github.com/btcpayserver/dockerfile-deps groestlcoin
+cd groestlcoin
+git checkout Groestlcoin/22.0
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.21.1" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/groestlcoin:22.0" .
 cd - && cd ..
 
 
@@ -713,7 +717,7 @@ DOCKERFILE="Dockerfile"
 echo "Building fireflyiii/core:latest"
 git clone https://dev.azure.com/Firefly-III/_git/MainImage core
 cd core
-git checkout 
+git checkout
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" .
 cd - && cd ..
@@ -1131,5 +1135,3 @@ git checkout master
 cd "$(dirname $DOCKERFILE)"
 docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" .
 cd - && cd ..
-
-

docker-compose-generator/docker-fragments/groestlcoin-clightning.yml

@@ -3,30 +3,25 @@ version: "3"
 services:
   clightning_groestlcoin:
     image: groestlcoin/lightning:v0.10.0
-    stop_signal: SIGKILL
     container_name: btcpayserver_clightning_groestlcoin
     restart: unless-stopped
     environment:
       LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       LIGHTNINGD_CHAIN: grs
+      LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS}
+      LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_ANNOUNCEABLE_HOST}
+      LIGHTNINGD_PORT: 9736
       LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/"
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/groestlcoin
         bitcoin-rpcconnect=groestlcoind
-        bitcoin-rpcport=43782
-        log-level=debug
-        announce-addr=${BTCPAY_HOST}:9738
-        bind-addr=0.0.0.0:9735
-        network=${NBITCOIN_NETWORK:-regtest}
-        alias=${LIGHTNING_ALIAS}
     volumes:
       - "clightning_groestlcoin_datadir:/root/.lightning"
       - "groestlcoin_datadir:/etc/groestlcoin"
       - "nbxplorer_datadir:/root/.nbxplorer"
     ports:
-      - "9738:9735"
+      - "9736:9736"
     links:
-      - nbxplorer
       - groestlcoind
   clightning_groestlcoin_charge:
     image: groestlcoin/groestlcoin-lightning-charge:version-0.4.22
@@ -35,6 +30,8 @@ services:
       NETWORK: ${NBITCOIN_NETWORK:-regtest}
       COOKIE_FILE: /data/.cookie
       URL: ${BTCPAY_ROOTPATH:-/}lightning-charge/grs/
+      LN_NET_PATH: /etc/lightning
+      LN_NET: /etc/lightning
     volumes:
       - "clightning_groestlcoin_datadir:/etc/lightning"
       - "clightning_groestlcoin_charge:/data"
@@ -42,6 +39,21 @@ services:
       - "9112"
     links:
       - clightning_groestlcoin
+
+  clightning_groestlcoin_spark:
+    image: groestlcoin/groestlcoin-spark:version-0.2.16
+    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:
+      - "9736"
+
   btcpayserver:
     environment:
       BTCPAY_GRSLIGHTNING: "type=clightning;server=unix://etc/clightning_groestlcoin/lightning-rpc"
@@ -53,20 +65,6 @@ services:
       - "clightning_groestlcoin_charge:/etc/clightning_groestlcoin_charge"
     links:
       - clightning_groestlcoin
-  clightning_groestlcoin_spark:
-    image: groestlcoin/groestlcoin-spark:version-0.2.16
-    stop_signal: SIGKILL
-    restart: unless-stopped
-    environment:
-      NETWORK: ${NBITCOIN_NETWORK:-regtest}
-      SPARK_OPT: --no-tls  --port 9739 -C /data/.cookie
-    volumes:
-      - "clightning_groestlcoin_datadir:/etc/lightning"
-      - "clightning_groestlcoin_spark:/data"
-    links:
-      - clightning_groestlcoin
-    expose:
-      - "9739"
 volumes:
   clightning_groestlcoin_datadir:
   clightning_groestlcoin_charge:

docker-compose-generator/docker-fragments/groestlcoin-eclair.yml

@@ -19,7 +19,7 @@ services:
         -Declair.chain=${NBITCOIN_NETWORK:-regtest}
         -Declair.server.binding-ip=0.0.0.0
         -Declair.server.public-ips.0=${BTCPAY_HOST}
-        -Declair.server.port=9735
+        -Declair.server.port=9736
         -Declair.api.enabled=true
         -Declair.api.binding-ip=0.0.0.0
         -Declair.api.port=8080
@@ -32,13 +32,14 @@ services:
         -Declair.bitcoind.zmqblock=tcp://groestlcoind:21441
         -Declair.bitcoind.zmqtx=tcp://groestlcoind:21441
     expose:
-      - "9735"  # server port
+      - "9736"  # server port
       - "8080"  # api port
     volumes:
       - "groestlcoin_datadir:/etc/groestlcoin"
       - "eclair_groestlcoin_datadir:/data"
     links:
       - groestlcoind
+
   btcpayserver:
     environment:
       BTCPAY_GRSLIGHTNING: "type=eclair;server=http://eclair_groestlcoin:8080;password=DwubwWsoo3"
@@ -49,6 +50,8 @@ services:
 volumes:
   eclair_groestlcoin_datadir:
 
+incompatible:
+  - pruning
 required:
   - "opt-add-zmq"
   - "opt-txindex"

docker-compose-generator/docker-fragments/groestlcoin-lnd.yml

@@ -11,22 +11,30 @@ services:
       LND_PORT: 9736
       LND_ALIAS: ${LIGHTNING_ALIAS}
       LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}"
+      LND_REST_LISTEN_HOST: http://lnd_groestlcoin:8080
+      LND_HOST_FOR_LOOP: 127.0.0.1:10009
       LND_EXTRA_ARGS: |
-        restlisten=0.0.0.0:8080
+        restlisten=lnd_groestlcoin:8080
         rpclisten=127.0.0.1:10008
-        rpclisten=0.0.0.0:10009
+        rpclisten=lnd_groestlcoin:10009
+        rpclisten=127.0.0.1:10009
         groestlcoin.node=groestlcoind
         groestlcoind.rpchost=groestlcoind:43782
+        groestlcoind.rpcuser=lnd
+        groestlcoind.rpcpass=afixedpasswordbecauselndsuckswithcookiefile
         groestlcoind.zmqpubrawblock=tcp://groestlcoind:21441
         groestlcoind.zmqpubrawtx=tcp://groestlcoind:21441
         adminmacaroonpath=/data/admin.macaroon
         invoicemacaroonpath=/data/invoice.macaroon
         readonlymacaroonpath=/data/readonly.macaroon
-        notls=1
+        tlsextradomain=lnd_groestlcoin
+        no-rest-tls=1
+        protocol.wumbo-channels=1
     ports:
       - "9736:9736"
     expose:
       - "8080"
+      - "8081"
       - "9736"
     volumes:
       - "lnd_groestlcoin_datadir:/data"
@@ -46,6 +54,15 @@ services:
     links:
       - lnd_groestlcoin
 
+  groestlcoind:
+    environment:
+      GROESTLCOIN_EXTRA_ARGS: |
+        # rpcuser=lnd
+        # rpcpassword=afixedpasswordbecauselndsuckswithcookiefile
+        # We need to use rpcauth because we also need cookieauth. rpcpassword disabled cookie file auth.
+        # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped.
+        rpcauth=lnd:d031f7567c5b02ba95524170e51c77f4$$827ce5412f653d6613c2f480e521eb437c866b999bdeb2ee4f9c41d3b00dff1c
+
   nginx:
     links:
       - "lnd_groestlcoin"

docker-compose-generator/docker-fragments/groestlcoin.yml

@@ -4,11 +4,17 @@ services:
   groestlcoind:
     restart: unless-stopped
     container_name: btcpayserver_groestlcoind
-    image: groestlcoin/docker-groestlcoin:2.21.1
+    image: btcpayserver/groestlcoin:22.0
     environment:
+      GROESTLCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+      GROESTLCOIN_WALLETDIR: "/walletdata"
+      # rpcport and rpcbind seems duplicates, but they are not
+      # rpcport is using by some tooling to automatically get
+      # the rpcport from the configuration file. Do not remove!
       GROESTLCOIN_EXTRA_ARGS: |
         rpcport=43782
-        ${NBITCOIN_NETWORK:-regtest}=1
+        rpcbind=0.0.0.0:43782
+        rpcallowip=0.0.0.0/0
         port=39388
         whitelist=0.0.0.0/0
     expose:
@@ -16,6 +22,7 @@ services:
       - "39388"
     volumes:
       - "groestlcoin_datadir:/data"
+      - "groestlcoin_wallet_datadir:/walletdata"
   nbxplorer:
     environment:
       NBXPLORER_CHAINS: "grs"
@@ -29,3 +36,4 @@ services:
       BTCPAY_GRSEXPLORERURL: http://nbxplorer:32838/
 volumes:
   groestlcoin_datadir:
+  groestlcoin_wallet_datadir: