From d6577aa6927021e74d042e8a23010107030d0919 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 6 Dec 2018 10:58:28 +0100 Subject: [PATCH] renamed pond -> spree, lake -> nile --- .../nodes/{lake_node.yml => nile_node.yml} | 10 +++--- .../nodes/{pond_node.yml => spree_node.yml} | 6 ++-- compose-files/secret_store.yml | 6 ++-- .../authorities/validator0.json | 0 .../{lake => nile}/authorities/validator0.pwd | 0 .../authorities/validator1.json | 0 .../{lake => nile}/authorities/validator1.pwd | 0 .../authorities/validator2.json | 0 .../{lake => nile}/authorities/validator2.pwd | 0 networks/{lake => nile}/config/chain.json | 2 +- networks/{lake => nile}/config/config.toml | 0 networks/{lake => nile}/config/member.toml | 0 networks/{lake => nile}/config/validator.toml | 0 networks/{lake => nile}/keys/account1.json | 0 networks/{lake => nile}/keys/account2.json | 0 .../{lake => nile}/keys/address_book.json | 0 networks/{lake => nile}/keys/master0.json | 0 networks/{lake => nile}/keys/master1.json | 0 networks/{lake => nile}/keys/validator.json | 0 networks/{lake => nile}/node0.network.key | 0 networks/{lake => nile}/node1.network.key | 0 networks/{lake => nile}/node2.network.key | 0 networks/{pond => spree}/config/chain.json | 2 +- networks/{pond => spree}/config/config.toml | 0 networks/{pond => spree}/keys/account1.json | 0 networks/{pond => spree}/keys/account2.json | 0 .../{pond => spree}/keys/address_book.json | 0 networks/{pond => spree}/keys/validator.json | 0 networks/{pond => spree}/keys/validator.pwd | 0 start_ocean.sh | 31 +++++++++---------- 30 files changed, 28 insertions(+), 29 deletions(-) rename compose-files/nodes/{lake_node.yml => nile_node.yml} (66%) rename compose-files/nodes/{pond_node.yml => spree_node.yml} (69%) rename networks/{lake => nile}/authorities/validator0.json (100%) rename networks/{lake => nile}/authorities/validator0.pwd (100%) rename networks/{lake => nile}/authorities/validator1.json (100%) rename networks/{lake => nile}/authorities/validator1.pwd (100%) rename networks/{lake => nile}/authorities/validator2.json (100%) rename networks/{lake => nile}/authorities/validator2.pwd (100%) rename networks/{lake => nile}/config/chain.json (99%) rename networks/{lake => nile}/config/config.toml (100%) rename networks/{lake => nile}/config/member.toml (100%) rename networks/{lake => nile}/config/validator.toml (100%) rename networks/{lake => nile}/keys/account1.json (100%) rename networks/{lake => nile}/keys/account2.json (100%) rename networks/{lake => nile}/keys/address_book.json (100%) rename networks/{lake => nile}/keys/master0.json (100%) rename networks/{lake => nile}/keys/master1.json (100%) rename networks/{lake => nile}/keys/validator.json (100%) rename networks/{lake => nile}/node0.network.key (100%) rename networks/{lake => nile}/node1.network.key (100%) rename networks/{lake => nile}/node2.network.key (100%) rename networks/{pond => spree}/config/chain.json (99%) rename networks/{pond => spree}/config/config.toml (100%) rename networks/{pond => spree}/keys/account1.json (100%) rename networks/{pond => spree}/keys/account2.json (100%) rename networks/{pond => spree}/keys/address_book.json (100%) rename networks/{pond => spree}/keys/validator.json (100%) rename networks/{pond => spree}/keys/validator.pwd (100%) diff --git a/compose-files/nodes/lake_node.yml b/compose-files/nodes/nile_node.yml similarity index 66% rename from compose-files/nodes/lake_node.yml rename to compose-files/nodes/nile_node.yml index 86728cf..990da8a 100644 --- a/compose-files/nodes/lake_node.yml +++ b/compose-files/nodes/nile_node.yml @@ -16,12 +16,12 @@ services: --unsafe-expose --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e volumes: - - ../networks/lake/config:/home/parity/parity/config + - ../networks/nile/config:/home/parity/parity/config - keeper-node:/home/parity/.local/share/io.parity.ethereum/ - - ../networks/lake/authorities/validator0.json:/home/parity/.local/share/io.parity.ethereum/keys/lake/validator.json - - ../networks/lake/keys:/home/parity/.local/share/io.parity.ethereum/keys/lake - - ../networks/lake/authorities/validator0.pwd:/home/parity/parity/validator.pwd - - ../networks/lake/node0.network.key:/home/parity/.local/share/io.parity.ethereum/network/key + - ../networks/nile/authorities/validator0.json:/home/parity/.local/share/io.parity.ethereum/keys/nile/validator.json + - ../networks/nile/keys:/home/parity/.local/share/io.parity.ethereum/keys/nile + - ../networks/nile/authorities/validator0.pwd:/home/parity/parity/validator.pwd + - ../networks/nile/node0.network.key:/home/parity/.local/share/io.parity.ethereum/network/key ports: - 8545:8545 networks: diff --git a/compose-files/nodes/pond_node.yml b/compose-files/nodes/spree_node.yml similarity index 69% rename from compose-files/nodes/pond_node.yml rename to compose-files/nodes/spree_node.yml index 251ff85..8e9adde 100644 --- a/compose-files/nodes/pond_node.yml +++ b/compose-files/nodes/spree_node.yml @@ -13,9 +13,9 @@ services: --jsonrpc-hosts all --jsonrpc-apis all volumes: - - ../networks/pond/config:/home/parity/parity/config - - ../networks/pond/keys/validator.pwd:/home/parity/parity/validator.pwd - - ../networks/pond/keys:/home/parity/.local/share/io.parity.ethereum/keys/pond + - ../networks/spree/config:/home/parity/parity/config + - ../networks/spree/keys/validator.pwd:/home/parity/parity/validator.pwd + - ../networks/spree/keys:/home/parity/.local/share/io.parity.ethereum/keys/spree ports: - 8545:8545 networks: diff --git a/compose-files/secret_store.yml b/compose-files/secret_store.yml index dc1d250..9dbf625 100644 --- a/compose-files/secret_store.yml +++ b/compose-files/secret_store.yml @@ -10,9 +10,9 @@ services: --jsonrpc-hosts all --jsonrpc-apis all volumes: - - ../parity/secret-store/config/:/etc/parity/secretstore/ + - ../networks/secret-store/config/:/etc/parity/secretstore/ - secret-store:/secret-store/ - - ../parity/secret-store/keys/:/secret-store/keys/secretstore/ + - ../networks/secret-store/keys/:/secret-store/keys/secretstore/ ports: - 12000:12000 - 12001 @@ -45,7 +45,7 @@ services: ports: - 9545:8545 volumes: - - ../parity/secret-store/keys:/home/parity/.local/keys/DevelopmentChain:ro + - ../networks/secret-store/keys:/home/parity/.local/keys/DevelopmentChain:ro networks: backend: ipv4_address: 172.15.0.18 \ No newline at end of file diff --git a/networks/lake/authorities/validator0.json b/networks/nile/authorities/validator0.json similarity index 100% rename from networks/lake/authorities/validator0.json rename to networks/nile/authorities/validator0.json diff --git a/networks/lake/authorities/validator0.pwd b/networks/nile/authorities/validator0.pwd similarity index 100% rename from networks/lake/authorities/validator0.pwd rename to networks/nile/authorities/validator0.pwd diff --git a/networks/lake/authorities/validator1.json b/networks/nile/authorities/validator1.json similarity index 100% rename from networks/lake/authorities/validator1.json rename to networks/nile/authorities/validator1.json diff --git a/networks/lake/authorities/validator1.pwd b/networks/nile/authorities/validator1.pwd similarity index 100% rename from networks/lake/authorities/validator1.pwd rename to networks/nile/authorities/validator1.pwd diff --git a/networks/lake/authorities/validator2.json b/networks/nile/authorities/validator2.json similarity index 100% rename from networks/lake/authorities/validator2.json rename to networks/nile/authorities/validator2.json diff --git a/networks/lake/authorities/validator2.pwd b/networks/nile/authorities/validator2.pwd similarity index 100% rename from networks/lake/authorities/validator2.pwd rename to networks/nile/authorities/validator2.pwd diff --git a/networks/lake/config/chain.json b/networks/nile/config/chain.json similarity index 99% rename from networks/lake/config/chain.json rename to networks/nile/config/chain.json index 4ae1041..5d9c4fe 100644 --- a/networks/lake/config/chain.json +++ b/networks/nile/config/chain.json @@ -1,5 +1,5 @@ { - "name": "lake", + "name": "nile", "engine": { "authorityRound": { "params": { diff --git a/networks/lake/config/config.toml b/networks/nile/config/config.toml similarity index 100% rename from networks/lake/config/config.toml rename to networks/nile/config/config.toml diff --git a/networks/lake/config/member.toml b/networks/nile/config/member.toml similarity index 100% rename from networks/lake/config/member.toml rename to networks/nile/config/member.toml diff --git a/networks/lake/config/validator.toml b/networks/nile/config/validator.toml similarity index 100% rename from networks/lake/config/validator.toml rename to networks/nile/config/validator.toml diff --git a/networks/lake/keys/account1.json b/networks/nile/keys/account1.json similarity index 100% rename from networks/lake/keys/account1.json rename to networks/nile/keys/account1.json diff --git a/networks/lake/keys/account2.json b/networks/nile/keys/account2.json similarity index 100% rename from networks/lake/keys/account2.json rename to networks/nile/keys/account2.json diff --git a/networks/lake/keys/address_book.json b/networks/nile/keys/address_book.json similarity index 100% rename from networks/lake/keys/address_book.json rename to networks/nile/keys/address_book.json diff --git a/networks/lake/keys/master0.json b/networks/nile/keys/master0.json similarity index 100% rename from networks/lake/keys/master0.json rename to networks/nile/keys/master0.json diff --git a/networks/lake/keys/master1.json b/networks/nile/keys/master1.json similarity index 100% rename from networks/lake/keys/master1.json rename to networks/nile/keys/master1.json diff --git a/networks/lake/keys/validator.json b/networks/nile/keys/validator.json similarity index 100% rename from networks/lake/keys/validator.json rename to networks/nile/keys/validator.json diff --git a/networks/lake/node0.network.key b/networks/nile/node0.network.key similarity index 100% rename from networks/lake/node0.network.key rename to networks/nile/node0.network.key diff --git a/networks/lake/node1.network.key b/networks/nile/node1.network.key similarity index 100% rename from networks/lake/node1.network.key rename to networks/nile/node1.network.key diff --git a/networks/lake/node2.network.key b/networks/nile/node2.network.key similarity index 100% rename from networks/lake/node2.network.key rename to networks/nile/node2.network.key diff --git a/networks/pond/config/chain.json b/networks/spree/config/chain.json similarity index 99% rename from networks/pond/config/chain.json rename to networks/spree/config/chain.json index 3a6c384..3c11fe4 100644 --- a/networks/pond/config/chain.json +++ b/networks/spree/config/chain.json @@ -1,5 +1,5 @@ { - "name": "pond", + "name": "spree", "engine": { "instantSeal": null }, diff --git a/networks/pond/config/config.toml b/networks/spree/config/config.toml similarity index 100% rename from networks/pond/config/config.toml rename to networks/spree/config/config.toml diff --git a/networks/pond/keys/account1.json b/networks/spree/keys/account1.json similarity index 100% rename from networks/pond/keys/account1.json rename to networks/spree/keys/account1.json diff --git a/networks/pond/keys/account2.json b/networks/spree/keys/account2.json similarity index 100% rename from networks/pond/keys/account2.json rename to networks/spree/keys/account2.json diff --git a/networks/pond/keys/address_book.json b/networks/spree/keys/address_book.json similarity index 100% rename from networks/pond/keys/address_book.json rename to networks/spree/keys/address_book.json diff --git a/networks/pond/keys/validator.json b/networks/spree/keys/validator.json similarity index 100% rename from networks/pond/keys/validator.json rename to networks/spree/keys/validator.json diff --git a/networks/pond/keys/validator.pwd b/networks/spree/keys/validator.pwd similarity index 100% rename from networks/pond/keys/validator.pwd rename to networks/spree/keys/validator.pwd diff --git a/start_ocean.sh b/start_ocean.sh index e8d35d2..d3f5deb 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -4,12 +4,15 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" COMPOSE_DIR="${DIR}/compose-files" export PROJECT_NAME="ocean" +# default to latest versions +export OCEAN_VERSION=latest # keeper options export KEEPER_DEPLOY_CONTRACTS="true" export KEEPER_ARTIFACTS_FOLDER=$HOME/.ocean/keeper-contracts/artifacts -# Specify which ethereum client to run or connect to: development, kovan, or ocean_poa_net_local -export KEEPER_NETWORK_NAME="ocean_poa_net_local" +# Specify which ethereum client to run or connect to: development, kovan, spree or nile +export KEEPER_NETWORK_NAME="nile" +export NODE_FILE=${COMPOSE_DIR}/nodes/nile_node.yml # Ganache specific option, these two options have no effect when not running ganache-cli export GANACHE_DATABASE_PATH="${DIR}" @@ -41,10 +44,6 @@ function show_banner { show_banner -# default to latest versions -export OCEAN_VERSION=latest -export NODE_FILE=${COMPOSE_DIR}/nodes/pond_node.yml - COMPOSE_FILES="" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml" @@ -104,19 +103,19 @@ while :; do export KEEPER_DEPLOY_CONTRACTS="true" printf $COLOR_Y'Starting with local Ganache node...\n\n'$COLOR_RESET ;; - # connects you to ocean testnet - --local-lake-node) - export NODE_FILE=${COMPOSE_DIR}/nodes/lake_node.yml - export KEEPER_NETWORK_NAME="ocean_poa_aws" - printf $COLOR_Y'Starting with local Lake node...\n\n'$COLOR_RESET + # connects you to nile ocean testnet + --local-nile-node) + export NODE_FILE=${COMPOSE_DIR}/nodes/nile_node.yml + export KEEPER_NETWORK_NAME="nile" + printf $COLOR_Y'Starting with local Nile node...\n\n'$COLOR_RESET ;; - # spins up pond local testnet - --local-pond-node) + # spins up spree local testnet + --local-spree-node) COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml" - export NODE_FILE=${COMPOSE_DIR}/nodes/pond_node.yml - export KEEPER_NETWORK_NAME="ocean_poa_net_local" + export NODE_FILE=${COMPOSE_DIR}/nodes/spree_node.yml + export KEEPER_NETWORK_NAME="spree" export KEEPER_DEPLOY_CONTRACTS="true" - printf $COLOR_Y'Starting with local Pond node...\n\n'$COLOR_RESET + printf $COLOR_Y'Starting with local Spree node...\n\n'$COLOR_RESET ;; ################################################# # Cleaning switches