From 229746b476f915377bc58b523a2dbd2e97e39a3e Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 12 Dec 2018 13:12:13 +0900 Subject: [PATCH 1/4] Update README of fastsync --- contrib/FastSync/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/FastSync/README.md b/contrib/FastSync/README.md index faca61e..2bf7bc8 100644 --- a/contrib/FastSync/README.md +++ b/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**. From 04442f537edd382366dfdc5b67334b004d0490db Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 11 Dec 2018 20:23:25 +0900 Subject: [PATCH 2/4] Add spark integration --- Production/nginx.tmpl | 9 +++++---- .../docker-fragments/bitcoin-clightning.yml | 19 ++++++++++++++++++- .../docker-fragments/btcpayserver.yml | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 147820b..8691739 100644 --- a/Production/nginx.tmpl +++ b/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 }} diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 05a3db6..8e0a29c 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/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: \ No newline at end of file + clightning_bitcoin_datadir: + clightning_bitcoin_spark: \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 5d15c4a..46bdfca 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/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.29} expose: - "49392" environment: From 0c67e2272758eeb4f7916b7c321a51c9fb58b5cb Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 12 Dec 2018 18:53:22 +0900 Subject: [PATCH 3/4] bump --- docker-compose-generator/docker-fragments/btcpayserver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 46bdfca..14c2dba 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -4,7 +4,7 @@ services: btcpayserver: restart: unless-stopped - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.29} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.30} expose: - "49392" environment: From 8ca1c44d7bcacad9b6b1a69d5d89db0ab61a4719 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 12 Dec 2018 19:08:33 +0900 Subject: [PATCH 4/4] Readonly macaroon in the /data directory --- docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 9de0d2a..74f764e 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/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: