From 33b2a86993a72467f25484a74e012da8d3e9dc8e Mon Sep 17 00:00:00 2001 From: MarcusJones Date: Thu, 5 Dec 2019 10:43:07 +0100 Subject: [PATCH] update option is now explicit for spree --- README.md | 1 + start_ocean.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 28ce767..5501976 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Common | `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. | | `--local-ganache-node` | Runs a local `ganache` node. | | `--local-spree-node` | Runs a node of the local `spree` network. This is the default. | +| `--local-spree-no-deploy` | Runs a node of the local `spree` network, without contract deployment. | | `--local-duero-node` | Runs a local parity node and connects the node to the `duero` network. | | `--local-nile-node` | Runs a local parity node and connects the node to the `nile` network. | | `--local-pacific-node` | Runs a local parity node and connects the node to the `pacific` network (official Ocean network | diff --git a/start_ocean.sh b/start_ocean.sh index 4940eb3..f3a85ea 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -43,7 +43,6 @@ export OCEAN_HOME="${HOME}/.ocean" # keeper options export KEEPER_OWNER_ROLE_ADDRESS="${KEEPER_OWNER_ROLE_ADDRESS}" export KEEPER_DEPLOY_CONTRACTS="true" -echo asdfasdfasdf export KEEPER_ARTIFACTS_FOLDER="${OCEAN_HOME}/keeper-contracts/artifacts" # Specify which ethereum client to run or connect to: development, spree or nile export KEEPER_NETWORK_NAME="spree" @@ -235,10 +234,6 @@ DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}" while :; do case $1 in - --no-deployment) - export KEEPER_DEPLOY_CONTRACTS="false" - printf $COLOR_Y'Keeping existing contracts...\n\n'$COLOR_RESET - ;; --exposeip) ;; ################################################# @@ -395,6 +390,14 @@ while :; do export KEEPER_NETWORK_NAME="spree" printf $COLOR_Y'Starting with local Spree node...\n\n'$COLOR_RESET ;; + --local-spree-no-deploy) + export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/spree_node.yml" + # use this seed only on spree! + export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another off lamp" + export KEEPER_NETWORK_NAME="spree" + export KEEPER_DEPLOY_CONTRACTS="false" + printf $COLOR_Y'Starting with local Spree node, and keeping existing contracts (no deployment)...\n\n'$COLOR_RESET + ;; ################################################# # Cleaning switches #################################################