Merge branch 'rpc/hidden_service'

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

@@ -4,20 +4,21 @@ services:
   bitcoind:
       restart: unless-stopped
       container_name: btcpayserver_bitcoind
-      image: btcpayserver/bitcoin:0.18.0
+      image: btcpayserver/bitcoin:0.18.0-1
       environment:
         BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
+        BITCOIN_WALLETDIR: "/walletdata"
         BITCOIN_EXTRA_ARGS: |
           rpcport=43782
           rpcbind=0.0.0.0:43782
           port=39388
-          disablewallet=1
           whitelist=0.0.0.0/0
       expose:
         - "43782"
         - "39388"
       volumes:
         - "bitcoin_datadir:/data"
+        - "bitcoin_wallet_datadir:/walletdata"
   nbxplorer:
       environment:
         NBXPLORER_CHAINS: "btc"
@@ -30,4 +31,5 @@ services:
         BTCPAY_CHAINS: "btc"
         BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/
 volumes:
-  bitcoin_datadir:
+  bitcoin_datadir:
+  bitcoin_wallet_datadir:

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

@@ -13,7 +13,7 @@ services:
       - "nginx_html:/usr/share/nginx/html"
   nginx-gen:
     restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.6
+    image: btcpayserver/docker-gen:0.7.7
     container_name: nginx-gen
     environment:
       DEFAULT_HOST: ${REVERSEPROXY_DEFAULT_HOST:-none}

docker-compose-generator/docker-fragments/opt-add-tor-relay.yml

@@ -2,7 +2,7 @@ version: "3"
 services:
   tor-relay-gen:
     restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.6
+    image: btcpayserver/docker-gen:0.7.7
     container_name: tor-relay-gen
     volumes:
       - "/var/run/docker.sock:/tmp/docker.sock:ro"

docker-compose-generator/docker-fragments/opt-add-tor.yml

@@ -35,11 +35,18 @@ services:
 
   bitcoind:
     environment:
-      HIDDENSERVICE_NAME: BTC-P2P
-      HIDDENSERVICE_VIRTUAL_PORT: 8333
-      HIDDENSERVICE_PORT: 39388
+      HIDDENSERVICE_NAME: BTC-P2P,BTC-RPC
+      BTC-P2P_HIDDENSERVICE_VIRTUAL_PORT: 8333
+      BTC-P2P_HIDDENSERVICE_PORT: 39388
+      BTC-RPC_HIDDENSERVICE_VIRTUAL_PORT: 8332
+      BTC-RPC_HIDDENSERVICE_PORT: 43782
       BITCOIN_EXTRA_ARGS: |
         onion=tor:9050
+        # rpcuser=btcrpc
+        # rpcpassword=btcpayserver4ever
+        # 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=btcrpc:a6a5d29a3f44f02e4cd8cabb5b10a234$$ab6152915515f6a9cca806d2ab5f0e2794c346ba74f812c61e48241d523778b8
     volumes:
     - "tor_datadir:/home/tor/.tor"
     links:
@@ -94,7 +101,7 @@ services:
 
   tor-gen:
     restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.6
+    image: btcpayserver/docker-gen:0.7.7
     container_name: tor-gen
     volumes:
       - "/var/run/docker.sock:/tmp/docker.sock:ro"