From 24c4621ef131da5bf9ce2ad3d53fc858591ca8f0 Mon Sep 17 00:00:00 2001 From: kexkey Date: Tue, 19 Feb 2019 17:19:29 -0500 Subject: [PATCH] Adjusted docs --- docker-compose-sample.yml | 7 +++++-- proxy_docker/README.md | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/docker-compose-sample.yml b/docker-compose-sample.yml index 2c3bb36..7240d42 100644 --- a/docker-compose-sample.yml +++ b/docker-compose-sample.yml @@ -27,10 +27,13 @@ services: # Bitcoin Mini Proxy environment: - "TRACING=1" - - "WATCHER_BTC_NODE_RPC_URL=bitcoin:18332/wallet/watching01.dat" + - "WATCHER_BTC_NODE_RPC_URL=bitcoin:18332/wallet" + - "WATCHER_BTC_NODE_DEFAULT_WALLET=watching01.dat" + - "WATCHER_BTC_NODE_XPUB_WALLET=xpubwatching01.dat" - "WATCHER_BTC_NODE_RPC_USER=bitcoin:CHANGEME" - "WATCHER_BTC_NODE_RPC_CFG=/tmp/watcher_btcnode_curlcfg.properties" - - "SPENDER_BTC_NODE_RPC_URL=bitcoin:18332/wallet/spending01.dat" + - "SPENDER_BTC_NODE_RPC_URL=bitcoin:18332/wallet" + - "SPENDER_BTC_NODE_DEFAULT_WALLET=spending01.dat" - "SPENDER_BTC_NODE_RPC_USER=bitcoin:CHANGEME" - "SPENDER_BTC_NODE_RPC_CFG=/tmp/spender_btcnode_curlcfg.properties" - "PROXY_LISTENING_PORT=8888" diff --git a/proxy_docker/README.md b/proxy_docker/README.md index ddffcb1..9d4bdd9 100644 --- a/proxy_docker/README.md +++ b/proxy_docker/README.md @@ -24,24 +24,27 @@ docker run --rm -d -p 8888:8888 --network cyphernodenet --env-file env.propertie ```properties TRACING=1 -WATCHER_BTC_NODE_RPC_URL=btcnode:18332/wallet/watching01.dat -WATCHER_BTC_NODE_RPC_USER=rpc_username:rpc_password -WATCHER_BTC_NODE_RPC_CFG=/proxy/watcher_btcnode_curlcfg.properties -SPENDER_BTC_NODE_RPC_URL=btcnode:18332/wallet/spending01.dat -SPENDER_BTC_NODE_RPC_USER=rpc_username:rpc_password -SPENDER_BTC_NODE_RPC_CFG=/proxy/spender_btcnode_curlcfg.properties +WATCHER_BTC_NODE_RPC_URL=bitcoin:18332/wallet +WATCHER_BTC_NODE_DEFAULT_WALLET=watching01.dat +WATCHER_BTC_NODE_XPUB_WALLET=xpubwatching01.dat +WATCHER_BTC_NODE_RPC_USER=bitcoin:CHANGEME +WATCHER_BTC_NODE_RPC_CFG=/tmp/watcher_btcnode_curlcfg.properties +SPENDER_BTC_NODE_RPC_URL=bitcoin:18332/wallet +SPENDER_BTC_NODE_DEFAULT_WALLET=spending01.dat +SPENDER_BTC_NODE_RPC_USER=bitcoin:CHANGEME +SPENDER_BTC_NODE_RPC_CFG=/tmp/spender_btcnode_curlcfg.properties PROXY_LISTENING_PORT=8888 # Variable substitutions don't work DB_PATH=/proxy/db DB_FILE=/proxy/db/proxydb # Pycoin container -PYCOIN_CONTAINER=pycoinnode:7777 -# OTS container -OTS_CONTAINER=otsnode:6666 - +PYCOIN_CONTAINER=pycoin:7777 DERIVATION_PUB32=upub5GtUcgGed1aGH4HKQ3vMYrsmLXwmHhS1AeX33ZvDgZiyvkGhNTvGd2TA5Lr4v239Fzjj4ZY48t6wTtXUy2yRgapf37QHgt6KWEZ6bgsCLpb DERIVATION_PATH=0/n WATCHER_BTC_NODE_PRUNED=false +# OTS container +OTSCLIENT_CONTAINER=otsclient:6666 +OTS_FILES=/proxy/otsfiles XPUB_DERIVATION_GAP=100 ```