From 6de7115bb10716e70fdf9e1ed2cfa7bdf3d1d5cc Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 08:30:58 +0100 Subject: [PATCH 1/8] map nmemoric to keeper environment --- compose-files/keeper_contracts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-files/keeper_contracts.yml b/compose-files/keeper_contracts.yml index 4915a2e..d905bdd 100644 --- a/compose-files/keeper_contracts.yml +++ b/compose-files/keeper_contracts.yml @@ -6,6 +6,7 @@ services: backend: ipv4_address: 172.15.0.14 environment: + NMEMORIC: ${KEEPER_NMEMORIC} DEPLOY_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} REUSE_DATABASE: ${GANACHE_REUSE_DATABASE} From 7fd215c1f7173fa96e163208727f84da816f4dd3 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 08:31:21 +0100 Subject: [PATCH 2/8] updated accounts to be used from spree nmemoric --- networks/spree/config/chain.json | 36 ++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/networks/spree/config/chain.json b/networks/spree/config/chain.json index 3361e87..1073b40 100644 --- a/networks/spree/config/chain.json +++ b/networks/spree/config/chain.json @@ -145,20 +145,38 @@ } } }, - "0x6B0c56d1Ad5144b4d37fa6e27DC9afd5C2435c3B": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { + "balance": "0x33B2E3C9FD0803CE8000000" }, - "0x0011598De1016A350ad719D23586273804076774": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e": { + "balance": "0x33B2E3C9FD0803CE8000000" }, - "0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0xA78deb2Fa79463945C247991075E2a0e98Ba7A09": { + "balance": "0x33B2E3C9FD0803CE8000000" }, - "0xa99d43d86a0758d5632313b8fa3972b6088a21bb": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0x02354A1F160A3fd7ac8b02ee91F04104440B28E7": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x529043886F21D9bc1AE0feDb751e34265a246e47": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xe08A1dAe983BC701D05E492DB80e0144f8f4b909": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xbcE5A3468386C64507D30136685A99cFD5603135": { + "balance": "0x33B2E3C9FD0803CE8000000" }, "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { - "balance": "0x200000000000000000000000000000000000000000000000" + "balance": "0x33B2E3C9FD0803CE8000000" } } } From 17a61336f952516f41fb669b7a629bcedcdb12e6 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 08:31:40 +0100 Subject: [PATCH 3/8] add nmemoric to start of spree node --- start_ocean.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 1ea8e38..1d8fc76 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -140,7 +140,9 @@ while :; do --local-spree-node) COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml" export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/spree_node.yml" - export KEEPER_NETWORK_NAME="spree" + # use this seed only on spree! + export KEEPER_NMEMORIC="taxi music thumb unique chat sand crew more leg another off lamp" + export KEEPER_NETWORK_NAME="spree_wallet" export KEEPER_DEPLOY_CONTRACTS="true" #rm -f ${KEEPER_ARTIFACTS_FOLDER}/ready printf $COLOR_Y'Starting with local Spree node...\n\n'$COLOR_RESET From 9b58cf4c2bc1f8e787ce171eee67aa6394365d0f Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 09:08:06 +0100 Subject: [PATCH 4/8] reorder accounts again, added the other accounts again --- networks/spree/config/chain.json | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/networks/spree/config/chain.json b/networks/spree/config/chain.json index 1073b40..75026ea 100644 --- a/networks/spree/config/chain.json +++ b/networks/spree/config/chain.json @@ -145,6 +145,21 @@ } } }, + "0x0011598De1016A350ad719D23586273804076774": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x6B0c56d1Ad5144b4d37fa6e27DC9afd5C2435c3B": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xA99D43d86A0758d5632313b8fA3972B6088A21BB": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { "balance": "0x33B2E3C9FD0803CE8000000" }, @@ -174,9 +189,6 @@ }, "0xbcE5A3468386C64507D30136685A99cFD5603135": { "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { - "balance": "0x33B2E3C9FD0803CE8000000" } } } From 5ef292d59dc941a2d444d57e8a7cc2575c5241f6 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 09:08:45 +0100 Subject: [PATCH 5/8] updated readme with current addresses that will get ether on launch of spree, added spree seedphrase --- README.md | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 94329d9..bb3e61c 100644 --- a/README.md +++ b/README.md @@ -147,14 +147,32 @@ Hostname | External Ports | Internal Url If you run the `./start_ocean.sh` script with the `--local-spree-node` option (please see [Keeper Node](#keeper-node) section of this document for more details). You will have available a keeper node in the local and private `spree` network with the following accounts enabled: -Account | Password | Balance ----------------------------------------------|------------|-------- -`0x00bd138abd70e2f00903268f3db08f2d25677c9e` | node0 | 10000000111000111000111000 -`0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0` | secret | 100000000 -`0xa99d43d86a0758d5632313b8fa3972b6088a21bb` | secret | 100000000 +Account | Type | Password/Key | Balance +---------------------------------------------|----------|------------------------------|----------------- +`0x0011598De1016A350ad719D23586273804076774` | key | | 1000000000 Ether +`0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e` | key | node0 | 1000000000 Ether +`0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0` | key | secret | 1000000000 Ether +`0x6B0c56d1Ad5144b4d37fa6e27DC9afd5C2435c3B` | key | | 1000000000 Ether +`0xA99D43d86A0758d5632313b8fA3972B6088A21BB` | key | secret | 1000000000 Ether +`0xe2DD09d719Da89e5a3D0F2549c7E24566e947260` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xA78deb2Fa79463945C247991075E2a0e98Ba7A09` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0x02354A1F160A3fd7ac8b02ee91F04104440B28E7` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0x529043886F21D9bc1AE0feDb751e34265a246e47` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xe08A1dAe983BC701D05E492DB80e0144f8f4b909` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether +`0xbcE5A3468386C64507D30136685A99cFD5603135` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether Use one of the above accounts to populate `PARITY_ADDRESS` and `PARITY_PASSWORD` in `brizo.env` file to avoid account `locked` issues from the keeper contracts. +#### Spree Mnemonic + +The accounts from type mnemonic can be access with this seedphrase: + +`taxi music thumb unique chat sand crew more leg another off lamp` + ### Nile Network Please see [Nile Testnet](https://docs.oceanprotocol.com/concepts/testnets/#nile-testnet) for details. From 42f12c950ec34b7038746549827621d100df2cf9 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 09:20:49 +0100 Subject: [PATCH 6/8] use correct network, fix typo --- compose-files/keeper_contracts.yml | 2 +- start_ocean.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose-files/keeper_contracts.yml b/compose-files/keeper_contracts.yml index d905bdd..5d8bf67 100644 --- a/compose-files/keeper_contracts.yml +++ b/compose-files/keeper_contracts.yml @@ -6,7 +6,7 @@ services: backend: ipv4_address: 172.15.0.14 environment: - NMEMORIC: ${KEEPER_NMEMORIC} + NMEMORIC: ${KEEPER_MNEMONIC} DEPLOY_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} REUSE_DATABASE: ${GANACHE_REUSE_DATABASE} diff --git a/start_ocean.sh b/start_ocean.sh index 1d8fc76..705a66d 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -141,8 +141,8 @@ while :; do COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml" export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/spree_node.yml" # use this seed only on spree! - export KEEPER_NMEMORIC="taxi music thumb unique chat sand crew more leg another off lamp" - export KEEPER_NETWORK_NAME="spree_wallet" + export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another off lamp" + export KEEPER_NETWORK_NAME="spree" export KEEPER_DEPLOY_CONTRACTS="true" #rm -f ${KEEPER_ARTIFACTS_FOLDER}/ready printf $COLOR_Y'Starting with local Spree node...\n\n'$COLOR_RESET From 9c470dfd7b4f24b06774108c27ec6098e64db787 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 11:36:55 +0100 Subject: [PATCH 7/8] removed unknown accounts --- README.md | 2 -- networks/spree/config/chain.json | 6 ------ networks/spree/keys/master0.json | 21 --------------------- networks/spree/keys/master1.json | 21 --------------------- 4 files changed, 50 deletions(-) delete mode 100644 networks/spree/keys/master0.json delete mode 100644 networks/spree/keys/master1.json diff --git a/README.md b/README.md index bb3e61c..8455396 100644 --- a/README.md +++ b/README.md @@ -149,10 +149,8 @@ You will have available a keeper node in the local and private `spree` network w Account | Type | Password/Key | Balance ---------------------------------------------|----------|------------------------------|----------------- -`0x0011598De1016A350ad719D23586273804076774` | key | | 1000000000 Ether `0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e` | key | node0 | 1000000000 Ether `0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0` | key | secret | 1000000000 Ether -`0x6B0c56d1Ad5144b4d37fa6e27DC9afd5C2435c3B` | key | | 1000000000 Ether `0xA99D43d86A0758d5632313b8fA3972B6088A21BB` | key | secret | 1000000000 Ether `0xe2DD09d719Da89e5a3D0F2549c7E24566e947260` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether `0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether diff --git a/networks/spree/config/chain.json b/networks/spree/config/chain.json index 75026ea..4affcaf 100644 --- a/networks/spree/config/chain.json +++ b/networks/spree/config/chain.json @@ -145,18 +145,12 @@ } } }, - "0x0011598De1016A350ad719D23586273804076774": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { "balance": "0x33B2E3C9FD0803CE8000000" }, "0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0": { "balance": "0x33B2E3C9FD0803CE8000000" }, - "0x6B0c56d1Ad5144b4d37fa6e27DC9afd5C2435c3B": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, "0xA99D43d86A0758d5632313b8fA3972B6088A21BB": { "balance": "0x33B2E3C9FD0803CE8000000" }, diff --git a/networks/spree/keys/master0.json b/networks/spree/keys/master0.json deleted file mode 100644 index 51c8c83..0000000 --- a/networks/spree/keys/master0.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "0d1533e9-dd7a-a838-68dc-36ddc025c1ab", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "acbabbab8eab2b952ad3cf2bd1aab0ca" - }, - "ciphertext": "134b54d057c3c0a9ac08b5eae36c46ab8dd45774215ce860afaeb4e8e50c927d", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "6f9e3ebd99b24becad3e8f773f44df8397cad68694abf7651880528d9552bfe7" - }, - "mac": "f8939019ec29b46694b5ac07fdf971ec740ca4de23e7ae84a1239f54c617f7d9" - }, - "address": "6b0c56d1ad5144b4d37fa6e27dc9afd5c2435c3b", - "name": "master0" -} diff --git a/networks/spree/keys/master1.json b/networks/spree/keys/master1.json deleted file mode 100644 index 5c78953..0000000 --- a/networks/spree/keys/master1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "76d1dcd3-0c3b-24c8-0875-78e3cc151659", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "6cbc68e1c87f82cefc954217cec45d64" - }, - "ciphertext": "a0f97cd495dbe38dc6fa13c23a7cc15a6abc75b894827bd2729a72bc3a1ec92d", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "b7704b289ced489bf6da93f6d335537763d3cc68460509321a73e50b185685de" - }, - "mac": "881850b5ce7709a7fd5ea923d97f77f0bd8717f054c44d35104cafc78d21813c" - }, - "address": "0011598de1016a350ad719d23586273804076774", - "name": "master1" -} From 237bf816272ad53d5d3a272711725a20d7ce8fa5 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Thu, 24 Jan 2019 12:03:09 +0100 Subject: [PATCH 8/8] avoid empty var message --- start_ocean.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/start_ocean.sh b/start_ocean.sh index 705a66d..86e72bd 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,6 +28,7 @@ export GANACHE_REUSE_DATABASE="false" export KEEPER_RPC_HOST='keeper-node' export KEEPER_RPC_PORT='8545' export KEEPER_RPC_URL="http://"${KEEPER_RPC_HOST}:${KEEPER_RPC_PORT} +export KEEPER_MNEMONIC='' # Enable acl-contract validation in Secret-store export CONFIGURE_ACL="false"