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

Production/nginx.tmpl

@@ -309,10 +309,6 @@ server {
 		proxy_pass http://lnd_bitcoin:8080/;
 	}
 		{{ end }}
-	{{ end }}
-
-	{{ range $container := $ }}
-		{{ $serviceName := (index $container.Labels "com.docker.compose.service") }}
 		{{ if (eq $serviceName "btcqbo") }}
 	location /btcqbo/ {
 		proxy_pass http://btcqbo:8001;
@@ -320,6 +316,11 @@ server {
 		proxy_set_header Host $host;
 		proxy_set_header X-Real-IP $remote_addr;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	}
+		{{ end }}
+		{{ if (eq $serviceName "clightning_bitcoin_spark") }}
+	location /spark/btc/ {
+		proxy_pass http://clightning_bitcoin_spark:9737/;
 	}
 		{{ end }}
 	{{ end }}

contrib/FastSync/README.md

@@ -92,7 +92,7 @@ bitcoin-cli.sh gettxoutsetinfo
 ```
 
 
-5. Verify that the output of `Synchy` and `Trusty` are **exactly** identical.
+5. Verify that the output of `Synchy` and `Trusty` are identical (you can ignore `disk_size`).
 
 NOTE: Completing those steps, under the assumption the software you are running is not malicious, **correctly prove that the UTXO set snapshot is legit**.
 

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

@@ -27,12 +27,29 @@ services:
     links:
       - nbxplorer
       - bitcoind
+  clightning_bitcoin_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_bitcoin_datadir:/etc/lightning"
+      - "clightning_bitcoin_spark:/data"
+    links:
+      - clightning_bitcoin
+    expose:
+     - "9737"
   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"
     volumes:
       - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
+      - "clightning_bitcoin_spark:/etc/clightning_bitcoin_spark"
     links:
       - clightning_bitcoin
 volumes:
-  clightning_bitcoin_datadir:
+  clightning_bitcoin_datadir:
+  clightning_bitcoin_spark:

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

@@ -21,6 +21,7 @@ services:
         alias=${LIGHTNING_ALIAS}
         adminmacaroonpath=/data/admin.macaroon
         invoicemacaroonpath=/data/invoice.macaroon
+        readonlymacaroonpath=/data/readonly.macaroon
         noseedbackup=1
         notls=1
     ports:

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

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