From e6f4ce678cd73a4063d1034ccd0a5e53a4f39200 Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Mon, 3 Dec 2018 18:08:09 -0500
Subject: [PATCH] wallet prefix in bitcoin.conf and setup permissions glitch
 fixed

---
 dist/setup.sh                                  |  2 +-
 doc/INSTALL.md                                 | 18 +++++++++---------
 .../app/templates/bitcoin/bitcoin.conf         | 14 ++++++++++----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/dist/setup.sh b/dist/setup.sh
index 168ed2a..02bd48e 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -110,7 +110,7 @@ sudo_if_required() {
 }
 
 modify_permissions() {
-  local directories=("installer" "gatekeeper" "lightning" "bitcoin" "docker-compose.yaml $BITCOIN_DATAPATH" "$LIGHTNING_DATAPATH" "$PROXY_DATAPATH" "$GATEKEEPER_DATAPATH" "$OTSCLIENT_DATAPATH")
+  local directories=("installer" "gatekeeper" "lightning" "bitcoin" "docker-compose.yaml" "$BITCOIN_DATAPATH" "$LIGHTNING_DATAPATH" "$PROXY_DATAPATH" "$GATEKEEPER_DATAPATH" "$OTSCLIENT_DATAPATH")
   for d in "${directories[@]}"
   do
     if [[ -e $d ]]; then
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index d78cd6a..eeab4b9 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -128,13 +128,13 @@ id="003";h64=$(echo -n "{\"alg\":\"HS256\",\"typ\":\"JWT\"}" | base64);p64=$(ech
 ## Test deployment from any host of the swarm
 
 ```shell
-echo "GET /getbestblockinfo" | docker run --rm -i --network=cyphernodenet alpine nc cyphernode:8888 -
-echo "GET /getbalance" | docker run --rm -i --network=cyphernodenet alpine nc cyphernode:8888 -
-echo "GET /getbestblockhash" | docker run --rm -i --network=cyphernodenet alpine nc cyphernode:8888 -
-echo "GET /getblockinfo/00000000a64e0d1ae0c39166f4e8717a672daf3d61bf7bbb41b0f487fcae74d2" | docker run --rm -i --network=cyphernodenet alpine nc cyphernode:8888 -
-curl -v -H "Content-Type: application/json" -d '{"address":"2MsWyaQ8APbnqasFpWopqUKqsdpiVY3EwLE","amount":0.2}' cyphernode:8888/spend
-echo "GET /ln_getinfo" | docker run --rm -i --network=cyphernodenet alpine nc cyphernode:8888 -
-echo "GET /ln_newaddr" | docker run --rm -i --network=cyphernodenet alpine nc cyphernode:8888 -
-curl -v -H "Content-Type: application/json" -d '{"msatoshi":10000,"label":"koNCcrSvhX3dmyFhW","description":"Bylls order #10649","expiry":900}' cyphernode:8888/ln_create_invoice
-curl -v -H "Content-Type: application/json" -d '{"bolt11":"lntb1pdca82tpp5gv8mn5jqlj6xztpnt4r472zcyrwf3y2c3cvm4uzg2gqcnj90f83qdp2gf5hgcm0d9hzqnm4w3kx2apqdaexgetjyq3nwvpcxgcqp2g3d86wwdfvyxcz7kce7d3n26d2rw3wf5tzpm2m5fl2z3mm8msa3xk8nv2y32gmzlhwjved980mcmkgq83u9wafq9n4w28amnmwzujgqpmapcr3","msatoshi":10000,"description":"Bitcoin Outlet order #7082"}' cyphernode:8888/ln_pay
+echo "GET /getbestblockinfo" | docker run --rm -i --network=cyphernodenet alpine nc proxy:8888 -
+echo "GET /getbalance" | docker run --rm -i --network=cyphernodenet alpine nc proxy:8888 -
+echo "GET /getbestblockhash" | docker run --rm -i --network=cyphernodenet alpine nc proxy:8888 -
+echo "GET /getblockinfo/00000000a64e0d1ae0c39166f4e8717a672daf3d61bf7bbb41b0f487fcae74d2" | docker run --rm -i --network=cyphernodenet alpine nc proxy:8888 -
+curl -v -H "Content-Type: application/json" -d '{"address":"2MsWyaQ8APbnqasFpWopqUKqsdpiVY3EwLE","amount":0.2}' proxy:8888/spend
+echo "GET /ln_getinfo" | docker run --rm -i --network=cyphernodenet alpine nc proxy:8888 -
+echo "GET /ln_newaddr" | docker run --rm -i --network=cyphernodenet alpine nc proxy:8888 -
+curl -v -H "Content-Type: application/json" -d '{"msatoshi":10000,"label":"koNCcrSvhX3dmyFhW","description":"Bylls order #10649","expiry":900}' proxy:8888/ln_create_invoice
+curl -v -H "Content-Type: application/json" -d '{"bolt11":"lntb1pdca82tpp5gv8mn5jqlj6xztpnt4r472zcyrwf3y2c3cvm4uzg2gqcnj90f83qdp2gf5hgcm0d9hzqnm4w3kx2apqdaexgetjyq3nwvpcxgcqp2g3d86wwdfvyxcz7kce7d3n26d2rw3wf5tzpm2m5fl2z3mm8msa3xk8nv2y32gmzlhwjved980mcmkgq83u9wafq9n4w28amnmwzujgqpmapcr3","msatoshi":10000,"description":"Bitcoin Outlet order #7082"}' proxy:8888/ln_pay
 ```
diff --git a/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf b/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf
index 7fc7651..c02e2fc 100644
--- a/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf
+++ b/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf
@@ -26,12 +26,18 @@ rpcpassword=<%= bitcoin_rpcpassword %>
 rpcallowip=0.0.0.0/0
 server=1
 
-wallet=watching01.dat
-wallet=spending01.dat
-wallet=ln01.dat
+<% if (net === 'testnet') { %>
+test.wallet=watching01.dat
+test.wallet=spending01.dat
+test.wallet=ln01.dat
+<% } else { %>
+main.wallet=watching01.dat
+main.wallet=spending01.dat
+main.wallet=ln01.dat
+<% } %>
 
 walletnotify=curl proxy:8888/conf/%s
 
 <% if ( bitcoin_uacomment != null && bitcoin_uacomment != '' ) { %>
 uacomment=<%= bitcoin_uacomment %>
-<% } %>
\ No newline at end of file
+<% } %>