Merge remote-tracking branch 'origin/master' into grs-clightning

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

@@ -28,7 +28,7 @@ services:
       - nbxplorer
       - bitcoind
   clightning_bitcoin_spark:
-    image: shesek/spark-wallet:0.2.0-WIP
+    image: shesek/spark-wallet:0.2.1-standalone
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -44,7 +44,7 @@ services:
   btcpayserver:
     environment:
       BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc"
-      BTCPAY_BTCEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/btc;cookiefile=/etc/clightning_bitcoin_spark/.cookie"
+      BTCPAY_BTCEXTERNALSPARK: "server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}${BTCPAY_ROOTPATH:-/}spark/btc/;cookiefile=/etc/clightning_bitcoin_spark/.cookie"
     volumes:
       - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
       - "clightning_bitcoin_spark:/etc/clightning_bitcoin_spark"

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

@@ -41,7 +41,7 @@ services:
     environment:
       BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=http://lnd_bitcoin:8080/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;allowinsecure=true"
       BTCPAY_BTCEXTERNALLNDGRPC: "type=lnd-grpc;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon"
-      BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon;restrictedmacaroonfilepath=/etc/lnd_bitcoin/invoice.macaroon"
+      BTCPAY_BTCEXTERNALLNDREST: "type=lnd-rest;server=${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/lnd-rest/btc/;macaroonfilepath=/etc/lnd_bitcoin/admin.macaroon"
     volumes:
       - "lnd_bitcoin_datadir:/etc/lnd_bitcoin"
     links:

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

@@ -4,7 +4,7 @@ services:
 
   btcpayserver:
     restart: unless-stopped
-    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.30}
+    image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.31}
     expose:
       - "49392"
     environment:

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

@@ -36,7 +36,7 @@ services:
 
   btcpayserver:
     environment:
-      BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;restrictedmacaroonfilepath=/etc/lnd_litecoin/invoice.macaroon;allowinsecure=true"
+      BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;allowinsecure=true"
     volumes:
       - "lnd_litecoin_datadir:/etc/lnd_litecoin"
     links:

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

@@ -4,7 +4,7 @@ services:
 
   nbxplorer:
     restart: unless-stopped
-    image: nicolasdorier/nbxplorer:2.0.0.2
+    image: nicolasdorier/nbxplorer:2.0.0.7
     expose: 
       - "32838"
     environment:

docker-compose-generator/docker-fragments/opt-save-memory.yml

@@ -5,35 +5,35 @@ services:
   bitcoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50
   bgoldd:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50
   feathercoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50
   groestlcoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50
   litecoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50
   viacoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50
   monacoind:
     environment:
       BITCOIN_EXTRA_ARGS: |
-        dbcache=150
-        maxmempool=100
+        dbcache=50
+        maxmempool=50