From ddb2b4ef304b32b5e910ad4cc4494974e35cdc83 Mon Sep 17 00:00:00 2001
From: Devrandom <c1.devrandom@niftybox.net>
Date: Wed, 6 Dec 2023 16:37:58 +0100
Subject: [PATCH] regtest volumes and expose vls port

---
 README.md                  |  8 +++++++-
 docker-compose.regtest.yml | 16 ++++++++++++++++
 docker-compose.testnet.yml |  3 ++-
 docker-compose.yml         |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fcede27..a88e20c 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,8 @@ You can run `bitcoind`, `lightningd`, `txood` and `vlsd` on a single node using
 
 ### Volume Creation
 
+Testnet:
+
 ```bash
 docker volume create bitcoin_data
 docker volume create lightning_data
@@ -109,6 +111,8 @@ docker volume create txoo_data
 docker volume create vls_data
 ```
 
+The `regtest` docker compose configuration doesn't use external volumes.  The automatically created volumes can be destroyed via the `down --volumes` docker compose command.
+
 ### Docker Compose Run
 
 ```bash
@@ -144,9 +148,11 @@ Above command will run `bitcoind`, `lightningd` and `txood` services on a single
 
 We have to run these commands after bitcoind is up and running.
 
-Create Wallet:
+Create wallet and make it load automatically:
 ```bash
 docker container exec bitcoind-regtest bitcoin-cli createwallet default
+docker container exec bitcoind-regtest bitcoin-cli unloadwallet default
+docker container exec bitcoind-regtest bitcoin-cli loadwallet default true
 ```
 
 Generate Address for node:
diff --git a/docker-compose.regtest.yml b/docker-compose.regtest.yml
index afdc3c5..8c96af4 100644
--- a/docker-compose.regtest.yml
+++ b/docker-compose.regtest.yml
@@ -2,6 +2,8 @@ version: "3.8"
 services:
   bitcoin-core:
     container_name: bitcoind-regtest
+    volumes:
+      - bitcoin_regtest:/home/bitcoin/.bitcoin
     expose:
       - 38332
     ports:
@@ -11,6 +13,8 @@ services:
 
   core-lightning:
     container_name: lightningd-regtest
+    volumes:
+      - lightning_regtest:/home/lightning/.lightning
     command:
       - --conf=/home/lightning/.lightning/regtest-config
       - --bitcoin-rpcconnect=bitcoind
@@ -18,12 +22,16 @@ services:
       - 19846
     ports:
       - 19846:19846
+      - 37701:7701
     environment:
       - VLS_NETWORK=regtest
       - BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:38332
 
   txoo:
     container_name: txoo-regtest
+    volumes:
+      - txoo_regtest:/root/.txoo/
+      - bitcoin_regtest:/root/.bitcoin/
     command:
       - -r http://rpcuser:VLSsigner1@bitcoind:38332
     environment:
@@ -31,6 +39,14 @@ services:
 
   vls:
     container_name: vlsd-regtest
+    volumes:
+      - vls_regtest:/home/vls/.lightning-signer
     environment:
       - VLS_NETWORK=regtest
       - BITCOIND_RPC_URL=http://rpcuser:VLSsigner1@bitcoind:38332
+
+volumes:
+  bitcoin_regtest:
+  lightning_regtest:
+  txoo_regtest:
+  vls_regtest:
diff --git a/docker-compose.testnet.yml b/docker-compose.testnet.yml
index 6e9bf94..f31cef3 100644
--- a/docker-compose.testnet.yml
+++ b/docker-compose.testnet.yml
@@ -6,4 +6,5 @@ services:
 
   core-lightning:
     ports:
-      - 19735:19735
\ No newline at end of file
+      - 19735:19735
+      - 17701:7701
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ad17b5..be07ab0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
     build:
       context: ./txood
     image: txood:${IMAGE_TAG:-latest}
-    container_name: txood-test
+    container_name: txoo-test
     restart: unless-stopped
     command:
       - -r http://rpcuser:VLSsigner1@bitcoind:18332