From dbfac86af5ffd676666450479e1b109013b92e99 Mon Sep 17 00:00:00 2001 From: Sebastian Gerske Date: Wed, 9 Oct 2019 12:29:32 +0200 Subject: [PATCH] fix secret store --- .../duero_addresses.txt | 0 .../nile_addresses.txt | 0 .../pacific_addresses.txt | 0 .../secret-store/config/chain_pacific.json | 109 ++++++++++++++++++ .../keys/pacific/address_book.json | 1 + networks/secret-store/keys/pacific/ss1.json | 23 ++++ start_ocean.sh | 18 ++- 7 files changed, 147 insertions(+), 4 deletions(-) rename duero_acl_contract_addresses.txt => ACL/duero_addresses.txt (100%) rename nile_acl_contract_addresses.txt => ACL/nile_addresses.txt (100%) rename pacific_acl_contract_addresses.txt => ACL/pacific_addresses.txt (100%) create mode 100644 networks/secret-store/config/chain_pacific.json create mode 100644 networks/secret-store/keys/pacific/address_book.json create mode 100644 networks/secret-store/keys/pacific/ss1.json diff --git a/duero_acl_contract_addresses.txt b/ACL/duero_addresses.txt similarity index 100% rename from duero_acl_contract_addresses.txt rename to ACL/duero_addresses.txt diff --git a/nile_acl_contract_addresses.txt b/ACL/nile_addresses.txt similarity index 100% rename from nile_acl_contract_addresses.txt rename to ACL/nile_addresses.txt diff --git a/pacific_acl_contract_addresses.txt b/ACL/pacific_addresses.txt similarity index 100% rename from pacific_acl_contract_addresses.txt rename to ACL/pacific_addresses.txt diff --git a/networks/secret-store/config/chain_pacific.json b/networks/secret-store/config/chain_pacific.json new file mode 100644 index 0000000..0953f1b --- /dev/null +++ b/networks/secret-store/config/chain_pacific.json @@ -0,0 +1,109 @@ +{ + "name": "pacific", + "engine": { + "authorityRound": { + "params": { + "stepDuration": "5", + "validators": { + "multi": { + "0": { + "list": [ + "0x58c0131d5a14b508a7d2cea1179cf8d384b7bf1a", + "0x5676b8e60728efdc33a65fcdb8c6d0965d5b045a", + "0xbe7ef68dcdbe6520a4ba380c59d1dadc012effff" + ] + } + } + } + } + } + }, + "params": { + "maximumExtraDataSize": "0x20", + "minGasLimit": "0x1388", + "networkID": "0xCEA11", + "gasLimitBoundDivisor": "0x400", + "eip140Transition": "0", + "eip145Transition": "0", + "eip211Transition": "0", + "eip214Transition": "0", + "eip658Transition": "0", + "eip1014Transition": "0", + "eip1052Transition": "0", + "eip1283Transition": "0", + "kip4Transition": "0", + "kip6Transition": "0", + "wasmActivationTransition": "0" + }, + "genesis": { + "seal": { + "authorityRound": { + "step": "0x0", + "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + } + }, + "difficulty": "0x20000", + "gasLimit": "0x165A0BC00" + }, + "accounts": { + "0x0000000000000000000000000000000000000001": { + "balance": "1", + "builtin": { + "name": "ecrecover", + "pricing": { + "linear": { + "base": 3000, + "word": 0 + } + } + } + }, + "0x0000000000000000000000000000000000000002": { + "balance": "1", + "builtin": { + "name": "sha256", + "pricing": { + "linear": { + "base": 60, + "word": 12 + } + } + } + }, + "0x0000000000000000000000000000000000000003": { + "balance": "1", + "builtin": { + "name": "ripemd160", + "pricing": { + "linear": { + "base": 600, + "word": 120 + } + } + } + }, + "0x0000000000000000000000000000000000000004": { + "balance": "1", + "builtin": { + "name": "identity", + "pricing": { + "linear": { + "base": 15, + "word": 3 + } + } + } + }, + "0x7eed82a01e7b3cc6c3bb472d34d875e6e2ead48b": { + "balance": "1606938044258990275541962092341162602522202993782792835301376" + } + }, + "nodes": [ + "enode://e5e44f4a86a706b4d00a51078df37c0240872a4b1a0b1561266573e42c1e76e8b48a80b46526accba41677323288cc395babd39ac7483b98808c2387addcd949@3.217.145.228:30303", + "enode://6a4aac724a2dc1076e26837723958549feef5202ce5dce35bfad443782a0a73da31a7dabe285d18d61c26dfb39e2dec55ed6d61e1af27b927741b5ff1ac399d7@3.217.208.52:30303", + "enode://7797c7ba758004af448ea0a33a9815b4578a14c98a1feb1717a954d9927d9b59c194dc50c59a9b4053277a92e0e96917e3340a2bcdb5d09e49cf9907f090d94b@3.217.90.136:30303", + "enode://c3c6b58cb12afee2b5ab92e418b86c542c3debebdc08f8c16e3e674b302517ac85118ee6519ab89855a45b0f2136d06a63194fa668d18d5757a1a0f0dfca18d9@3.218.32.223:30303", + "enode://58fea462352fa09ae22893a849ca6a6600a1a24ffacd25fe7f380ec442163edd0ce5b5884ab63451adf6b1df9b651ad6b5ffcaa74fe1e2346aabda3419686e52@52.206.124.28:30303", + "enode://496cdd8b49f17cbe3000ef3d0cad2ff92aa321a04e791af562fb6f66dfe634a5eb28fb80148d58d5bf99e115a21f3d433f8ce54f9ae79a9e619e213bb6585d73@54.158.180.108:30303" + ] +} diff --git a/networks/secret-store/keys/pacific/address_book.json b/networks/secret-store/keys/pacific/address_book.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/networks/secret-store/keys/pacific/address_book.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/networks/secret-store/keys/pacific/ss1.json b/networks/secret-store/keys/pacific/ss1.json new file mode 100644 index 0000000..f89169c --- /dev/null +++ b/networks/secret-store/keys/pacific/ss1.json @@ -0,0 +1,23 @@ +{ + "id": "cb4f3330-9f0f-cd4d-d554-5aa6442b10be", + "version": 3, + "crypto": { + "cipher": "aes-128-ctr", + "cipherparams": { + "iv": "937c23da18782823c3a44b33a48f5422" + }, + "ciphertext": "10573d6899aee16f08ad747d70ffdd3df46a515b1a346f1456fe9ecf4e0771e5", + "kdf": "pbkdf2", + "kdfparams": { + "c": 10240, + "dklen": 32, + "prf": "hmac-sha256", + "salt": "838feb11a3e307cf9e5677e061e3fbd322dcb202e96a824d14c9b10d3147d1f1" + }, + "mac": "15ff1a017d21dca4dd2d10064665ea14f9ccab91fd4337c7b00a564bb333fffe" + }, + "address": "a1345ed0b2d1e193aead673e33dac56515af128a", + "name": "", + "meta": "{}" +} + diff --git a/start_ocean.sh b/start_ocean.sh index b8dc41e..47f5ceb 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -120,11 +120,22 @@ COLOR_C="\033[0;36m" # cyan COLOR_RESET="\033[00m" function get_acl_address { + # detect keeper version local version="${1:-latest}" - line=$(grep "^${version}=" "${DIR}/${KEEPER_NETWORK_NAME}_acl_contract_addresses.txt") + + # sesarch in the file for the keeper version + line=$(grep "^${version}=" "${DIR}/ACL/${KEEPER_NETWORK_NAME}_addresses.txt") + # set address address="${line##*=}" - # [ -z "${address}" ] && echo "Cannot determine the ACL Contract Address for ${KEEPER_NETWORK_NAME} version ${version}. Exiting" && exit 1 - [ -z "${address}" ] && line=$(grep "^$latest=" "${DIR}/${KEEPER_NETWORK_NAME}_acl_contract_addresses.txt") && address="${line##*=}" + + # if address is still empty + if [ -z "${address}" ]; then + # fetch from latest line + line=$(grep "^latest=" "${DIR}/ACL/${KEEPER_NETWORK_NAME}_addresses.txt") + # set address + address="${line##*=}" + fi + echo "${address}" } @@ -329,7 +340,6 @@ while :; do --local-pacific-node) export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/pacific_node.yml" COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}" export KEEPER_MNEMONIC='' export KEEPER_NETWORK_NAME="pacific" export KEEPER_DEPLOY_CONTRACTS="false"