Update Dockerfile and compose.yml

Dockerfile

@@ -31,3 +31,6 @@ RUN pip3 install .
 # install counterparty-cli
 WORKDIR /counterparty-cli
 RUN pip3 install .
+
+ENTRYPOINT [ "counterparty-server", "start" ]
+CMD [ "-h" ]

counterparty-cli/counterpartycli/client.py

@@ -37,7 +37,7 @@
  [('--wallet-name',), {'default': 'bitcoincore', 'help': 'the wallet name to connect to'}],
  [('--wallet-connect',), {'default': 'localhost', 'help': 'the hostname or IP of the wallet server'}],
  [('--wallet-port',), {'type': int, 'help': 'the wallet port to connect to'}],
- [('--wallet-user',), {'default': 'bitcoinrpc', 'help': 'the username used to communicate with wallet'}],
+ [('--wallet-user',), {'default': 'rpc', 'help': 'the username used to communicate with wallet'}],
  [('--wallet-password',), {'help': 'the password used to communicate with wallet'}],
  [('--wallet-ssl',), {'action': 'store_true', 'default': False, 'help': 'use SSL to connect to wallet (default: false)'}],
  [('--wallet-ssl-verify',), {'action': 'store_true', 'default': False, 'help': 'verify SSL certificate of wallet; disallow use of self‐signed certificates (default: false)'}],

counterparty-cli/counterpartycli/clientapi.py

@@ -119,7 +119,7 @@ def handle_exception(exc_type, exc_value, exc_traceback):
  raise ConfigurationError("Please specific a valid port number wallet-port configuration parameter")
 
  # BTC Wallet user
- config.WALLET_USER = wallet_user or 'bitcoinrpc'
+ config.WALLET_USER = wallet_user or 'rpc'
 
  # BTC Wallet password
  if wallet_password:

counterparty-cli/counterpartycli/server.py

@@ -29,7 +29,7 @@
  [('--backend-name',), {'default': 'addrindex', 'help': 'the backend name to connect to'}],
  [('--backend-connect',), {'default': 'localhost', 'help': 'the hostname or IP of the backend server'}],
  [('--backend-port',), {'type': int, 'help': 'the backend port to connect to'}],
- [('--backend-user',), {'default': 'bitcoinrpc', 'help': 'the username used to communicate with backend'}],
+ [('--backend-user',), {'default': 'rpc', 'help': 'the username used to communicate with backend'}],
  [('--backend-password',), {'default': 'rpc', 'help': 'the password used to communicate with backend'}],
  [('--backend-ssl',), {'action': 'store_true', 'default': False, 'help': 'use SSL to connect to backend (default: false)'}],
  [('--backend-ssl-no-verify',), {'action': 'store_true', 'default': False, 'help': 'verify SSL certificate of backend; disallow use of self‐signed certificates (default: true)'}],
@@ -43,7 +43,7 @@
  [('--rpc-host',), {'default': 'localhost', 'help': 'the IP of the interface to bind to for providing JSON-RPC API access (0.0.0.0 for all interfaces)'}],
  [('--rpc-port',), {'type': int, 'help': f'port on which to provide the {config.APP_NAME} JSON-RPC API'}],
  [('--rpc-user',), {'default': 'rpc', 'help': f'required username to use the {config.APP_NAME} JSON-RPC API (via HTTP basic auth)'}],
- [('--rpc-password',), {'help':f'required password (for rpc-user) to use the {config.APP_NAME} JSON-RPC API (via HTTP basic auth)'}],
+ [('--rpc-password',), {'default': 'rpc', 'help':f'required password (for rpc-user) to use the {config.APP_NAME} JSON-RPC API (via HTTP basic auth)'}],
  [('--rpc-no-allow-cors',), {'action': 'store_true', 'default': False, 'help': 'allow ajax cross domain request'}],
  [('--rpc-batch-size',), {'type': int, 'default': config.DEFAULT_RPC_BATCH_SIZE, 'help': f'number of RPC queries by batch (default: {config.DEFAULT_RPC_BATCH_SIZE})'}],
  [('--requests-timeout',), {'type': int, 'default': config.DEFAULT_REQUESTS_TIMEOUT, 'help': 'timeout value (in seconds) used for all HTTP requests (default: 5)'}],

simplenode/compose.yml

@@ -55,19 +55,11 @@ services:
  ports:
  - "4000:4000" # mainnet
  # - "14000:14000" # testnet
- entrypoint: "counterparty-server" # TODO: `start` has to come after the flags.
  command:
  # "--testnet" # testnet
  - "--backend-connect=bitcoind"
- - "--backend-user=rpc"
- - "--backend-password=rpc"
  - "--indexd-connect=addrindexrs"
- - "--rpc-user=rpc"
- - "--rpc-password=rpc"
  - "--rpc-host=0.0.0.0"
- - "--log-file=1"
- - "--api-log-file=1"
- - "start"
  - "--catch-up=bootstrap"
  environment:
  - "XDG_DATA_HOME=/data/"