From a4e32d3f9a680b41d9bd3b3d11e830a760172211 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Fri, 26 Jun 2020 08:37:46 -0700 Subject: [PATCH 01/51] first cut --- ACL/duero_addresses.txt | 5 - ACL/nile_addresses.txt | 28 - ACL/pacific_addresses.txt | 3 - accounts/provider.json | 22 - brizo.env | 10 - compose-files/agent.yml | 24 - compose-files/aquarius_elasticsearch.yml | 1 + compose-files/brizo.yml | 29 - compose-files/commons.yml | 41 -- compose-files/events_handler.yml | 21 - compose-files/faucet.yml | 25 - compose-files/keeper_contracts.yml | 24 - compose-files/network_volumes.yml | 6 - compose-files/nodes/duero_node.yml | 23 - compose-files/nodes/ganache_node.yml | 11 - compose-files/nodes/nile_node.yml | 23 - compose-files/nodes/pacific_node.yml | 23 - compose-files/nodes/spree_node.yml | 28 - compose-files/provider.yml | 22 + compose-files/secret_store.yml | 42 -- compose-files/secret_store_signing_node.yml | 21 - cors-proxy.conf | 29 - networks/duero/authorities/validator0.json | 22 - networks/duero/authorities/validator0.pwd | 1 - networks/duero/config/chain.json | 175 ------ networks/duero/config/config.toml | 16 - networks/duero/keys/address_book.json | 1 - networks/duero/keys/consumer.json | 22 - networks/duero/keys/publisher.json | 22 - networks/nile/authorities/validator0.json | 22 - networks/nile/authorities/validator0.pwd | 1 - networks/nile/config/chain.json | 175 ------ networks/nile/config/config.toml | 16 - networks/nile/keys/address_book.json | 1 - networks/nile/keys/publisher.json | 22 - networks/pacific/config/chain.json | 109 ---- networks/pacific/config/config.toml | 17 - networks/pacific/keys/address_book.json | 1 - networks/pacific/keys/publisher.json | 22 - networks/secret-store/config/chain_duero.json | 175 ------ networks/secret-store/config/chain_nile.json | 158 ----- .../secret-store/config/chain_pacific.json | 109 ---- networks/secret-store/config/chain_spree.json | 553 ------------------ networks/secret-store/config/config.toml.save | 54 -- networks/secret-store/config/password | 1 - .../keys/DevelopmentChain/address_book.json | 1 - .../keys/DevelopmentChain/dev.json | 22 - .../keys/DevelopmentChain/publisher.json | 22 - .../keys/DevelopmentChain/test_account.json | 22 - .../secret-store/keys/duero/address_book.json | 1 - .../secret-store/keys/duero/consumer.json | 22 - .../secret-store/keys/duero/publisher.json | 22 - networks/secret-store/keys/duero/ss1.json | 23 - .../secret-store/keys/duero/test_account.json | 22 - .../secret-store/keys/nile/address_book.json | 1 - .../secret-store/keys/nile/publisher.json | 22 - networks/secret-store/keys/nile/ss1.json | 23 - .../secret-store/keys/nile/test_account.json | 22 - .../keys/pacific/address_book.json | 1 - networks/secret-store/keys/pacific/ss1.json | 23 - .../secret-store/keys/spree/address_book.json | 1 - .../secret-store/keys/spree/publisher.json | 22 - networks/secret-store/keys/spree/ss1.json | 23 - .../secret-store/keys/spree/test_account.json | 22 - networks/spree/authorities/validator0.json | 22 - networks/spree/authorities/validator0.pwd | 1 - networks/spree/authorities/validator1.json | 22 - networks/spree/authorities/validator1.pwd | 1 - networks/spree/authorities/validator2.json | 22 - networks/spree/authorities/validator2.pwd | 1 - networks/spree/config/chain.json | 553 ------------------ networks/spree/config/config.toml | 26 - networks/spree/keys/address_book.json | 1 - networks/spree/keys/publisher.json | 22 - networks/spree/keys/test_account.json | 22 - networks/spree/keys/test_account01.json | 1 - networks/spree/keys/test_account02.json | 1 - networks/spree/keys/test_account03.json | 1 - networks/spree/keys/test_account04.json | 1 - networks/spree/keys/test_account05.json | 1 - networks/spree/keys/test_account06.json | 1 - networks/spree/keys/test_account07.json | 1 - networks/spree/keys/test_account08.json | 1 - networks/spree/keys/test_account09.json | 1 - networks/spree/keys/test_account10.json | 1 - networks/spree/keys/test_account11.json | 1 - networks/spree/keys/test_account12.json | 1 - networks/spree/keys/test_account13.json | 1 - networks/spree/keys/test_account14.json | 1 - networks/spree/keys/test_account15.json | 1 - networks/spree/keys/test_account16.json | 1 - networks/spree/keys/test_account17.json | 1 - networks/spree/keys/test_account18.json | 1 - networks/spree/keys/test_account19.json | 1 - networks/spree/keys/test_account20.json | 1 - networks/spree/keys/test_account21.json | 1 - networks/spree/keys/test_account22.json | 1 - networks/spree/keys/test_account23.json | 1 - networks/spree/keys/test_account24.json | 1 - networks/spree/keys/test_account25.json | 1 - networks/spree/keys/test_account26.json | 1 - networks/spree/keys/test_account27.json | 1 - networks/spree/keys/test_account28.json | 1 - networks/spree/keys/test_account29.json | 1 - networks/spree/keys/test_account30.json | 1 - networks/spree/keys/test_account31.json | 1 - networks/spree/keys/test_account32.json | 1 - networks/spree/keys/test_account33.json | 1 - networks/spree/keys/test_account34.json | 1 - networks/spree/keys/test_account35.json | 1 - networks/spree/keys/test_account36.json | 1 - networks/spree/keys/test_account37.json | 1 - networks/spree/keys/test_account38.json | 1 - networks/spree/keys/test_account39.json | 1 - networks/spree/keys/test_account40.json | 1 - networks/spree/keys/test_account41.json | 1 - networks/spree/keys/test_account42.json | 1 - networks/spree/keys/test_account43.json | 1 - networks/spree/keys/test_account44.json | 1 - networks/spree/keys/test_account45.json | 1 - networks/spree/keys/test_account46.json | 1 - networks/spree/keys/test_account47.json | 1 - networks/spree/keys/test_account48.json | 1 - networks/spree/keys/test_account49.json | 1 - networks/spree/keys/test_account50.json | 1 - networks/spree/keys/test_account51.json | 1 - networks/spree/keys/test_account52.json | 1 - networks/spree/keys/test_account53.json | 1 - networks/spree/keys/test_account54.json | 1 - networks/spree/keys/test_account55.json | 1 - networks/spree/keys/test_account56.json | 1 - networks/spree/keys/test_account57.json | 1 - networks/spree/keys/test_account58.json | 1 - networks/spree/keys/test_account59.json | 1 - networks/spree/keys/test_account60.json | 1 - networks/spree/keys/validator.json | 23 - start_ocean.sh | 244 +------- 137 files changed, 38 insertions(+), 3455 deletions(-) delete mode 100644 ACL/duero_addresses.txt delete mode 100644 ACL/nile_addresses.txt delete mode 100644 ACL/pacific_addresses.txt delete mode 100755 accounts/provider.json delete mode 100755 brizo.env delete mode 100644 compose-files/agent.yml delete mode 100644 compose-files/brizo.yml delete mode 100644 compose-files/commons.yml delete mode 100644 compose-files/events_handler.yml delete mode 100644 compose-files/faucet.yml delete mode 100644 compose-files/keeper_contracts.yml delete mode 100644 compose-files/nodes/duero_node.yml delete mode 100644 compose-files/nodes/ganache_node.yml delete mode 100644 compose-files/nodes/nile_node.yml delete mode 100644 compose-files/nodes/pacific_node.yml delete mode 100644 compose-files/nodes/spree_node.yml create mode 100644 compose-files/provider.yml delete mode 100644 compose-files/secret_store.yml delete mode 100644 compose-files/secret_store_signing_node.yml delete mode 100644 cors-proxy.conf delete mode 100644 networks/duero/authorities/validator0.json delete mode 100644 networks/duero/authorities/validator0.pwd delete mode 100644 networks/duero/config/chain.json delete mode 100644 networks/duero/config/config.toml delete mode 100644 networks/duero/keys/address_book.json delete mode 100644 networks/duero/keys/consumer.json delete mode 100755 networks/duero/keys/publisher.json delete mode 100644 networks/nile/authorities/validator0.json delete mode 100644 networks/nile/authorities/validator0.pwd delete mode 100644 networks/nile/config/chain.json delete mode 100644 networks/nile/config/config.toml delete mode 100644 networks/nile/keys/address_book.json delete mode 100755 networks/nile/keys/publisher.json delete mode 100644 networks/pacific/config/chain.json delete mode 100644 networks/pacific/config/config.toml delete mode 100644 networks/pacific/keys/address_book.json delete mode 100755 networks/pacific/keys/publisher.json delete mode 100644 networks/secret-store/config/chain_duero.json delete mode 100644 networks/secret-store/config/chain_nile.json delete mode 100644 networks/secret-store/config/chain_pacific.json delete mode 100644 networks/secret-store/config/chain_spree.json delete mode 100644 networks/secret-store/config/config.toml.save delete mode 100644 networks/secret-store/config/password delete mode 100644 networks/secret-store/keys/DevelopmentChain/address_book.json delete mode 100644 networks/secret-store/keys/DevelopmentChain/dev.json delete mode 100644 networks/secret-store/keys/DevelopmentChain/publisher.json delete mode 100644 networks/secret-store/keys/DevelopmentChain/test_account.json delete mode 100644 networks/secret-store/keys/duero/address_book.json delete mode 100644 networks/secret-store/keys/duero/consumer.json delete mode 100644 networks/secret-store/keys/duero/publisher.json delete mode 100644 networks/secret-store/keys/duero/ss1.json delete mode 100644 networks/secret-store/keys/duero/test_account.json delete mode 100644 networks/secret-store/keys/nile/address_book.json delete mode 100644 networks/secret-store/keys/nile/publisher.json delete mode 100644 networks/secret-store/keys/nile/ss1.json delete mode 100644 networks/secret-store/keys/nile/test_account.json delete mode 100644 networks/secret-store/keys/pacific/address_book.json delete mode 100644 networks/secret-store/keys/pacific/ss1.json delete mode 100644 networks/secret-store/keys/spree/address_book.json delete mode 100644 networks/secret-store/keys/spree/publisher.json delete mode 100644 networks/secret-store/keys/spree/ss1.json delete mode 100644 networks/secret-store/keys/spree/test_account.json delete mode 100644 networks/spree/authorities/validator0.json delete mode 100644 networks/spree/authorities/validator0.pwd delete mode 100644 networks/spree/authorities/validator1.json delete mode 100644 networks/spree/authorities/validator1.pwd delete mode 100644 networks/spree/authorities/validator2.json delete mode 100644 networks/spree/authorities/validator2.pwd delete mode 100644 networks/spree/config/chain.json delete mode 100644 networks/spree/config/config.toml delete mode 100755 networks/spree/keys/address_book.json delete mode 100755 networks/spree/keys/publisher.json delete mode 100755 networks/spree/keys/test_account.json delete mode 100755 networks/spree/keys/test_account01.json delete mode 100755 networks/spree/keys/test_account02.json delete mode 100755 networks/spree/keys/test_account03.json delete mode 100755 networks/spree/keys/test_account04.json delete mode 100755 networks/spree/keys/test_account05.json delete mode 100755 networks/spree/keys/test_account06.json delete mode 100755 networks/spree/keys/test_account07.json delete mode 100755 networks/spree/keys/test_account08.json delete mode 100755 networks/spree/keys/test_account09.json delete mode 100755 networks/spree/keys/test_account10.json delete mode 100755 networks/spree/keys/test_account11.json delete mode 100755 networks/spree/keys/test_account12.json delete mode 100755 networks/spree/keys/test_account13.json delete mode 100755 networks/spree/keys/test_account14.json delete mode 100755 networks/spree/keys/test_account15.json delete mode 100755 networks/spree/keys/test_account16.json delete mode 100755 networks/spree/keys/test_account17.json delete mode 100755 networks/spree/keys/test_account18.json delete mode 100755 networks/spree/keys/test_account19.json delete mode 100755 networks/spree/keys/test_account20.json delete mode 100755 networks/spree/keys/test_account21.json delete mode 100755 networks/spree/keys/test_account22.json delete mode 100755 networks/spree/keys/test_account23.json delete mode 100755 networks/spree/keys/test_account24.json delete mode 100755 networks/spree/keys/test_account25.json delete mode 100755 networks/spree/keys/test_account26.json delete mode 100755 networks/spree/keys/test_account27.json delete mode 100755 networks/spree/keys/test_account28.json delete mode 100755 networks/spree/keys/test_account29.json delete mode 100755 networks/spree/keys/test_account30.json delete mode 100755 networks/spree/keys/test_account31.json delete mode 100755 networks/spree/keys/test_account32.json delete mode 100755 networks/spree/keys/test_account33.json delete mode 100755 networks/spree/keys/test_account34.json delete mode 100755 networks/spree/keys/test_account35.json delete mode 100755 networks/spree/keys/test_account36.json delete mode 100755 networks/spree/keys/test_account37.json delete mode 100755 networks/spree/keys/test_account38.json delete mode 100755 networks/spree/keys/test_account39.json delete mode 100755 networks/spree/keys/test_account40.json delete mode 100755 networks/spree/keys/test_account41.json delete mode 100755 networks/spree/keys/test_account42.json delete mode 100755 networks/spree/keys/test_account43.json delete mode 100755 networks/spree/keys/test_account44.json delete mode 100755 networks/spree/keys/test_account45.json delete mode 100755 networks/spree/keys/test_account46.json delete mode 100755 networks/spree/keys/test_account47.json delete mode 100755 networks/spree/keys/test_account48.json delete mode 100755 networks/spree/keys/test_account49.json delete mode 100755 networks/spree/keys/test_account50.json delete mode 100755 networks/spree/keys/test_account51.json delete mode 100755 networks/spree/keys/test_account52.json delete mode 100755 networks/spree/keys/test_account53.json delete mode 100755 networks/spree/keys/test_account54.json delete mode 100755 networks/spree/keys/test_account55.json delete mode 100755 networks/spree/keys/test_account56.json delete mode 100755 networks/spree/keys/test_account57.json delete mode 100755 networks/spree/keys/test_account58.json delete mode 100755 networks/spree/keys/test_account59.json delete mode 100755 networks/spree/keys/test_account60.json delete mode 100755 networks/spree/keys/validator.json diff --git a/ACL/duero_addresses.txt b/ACL/duero_addresses.txt deleted file mode 100644 index 41fcb39..0000000 --- a/ACL/duero_addresses.txt +++ /dev/null @@ -1,5 +0,0 @@ -Duero -Version=address -v0.11.0=0xB381718cc93289CD8309ba24D1Da7cb2a2a096d2 -v0.11.1=0x38e26f97AcCc0f6f0bA70b6304d89781449BAc11 -latest=0x38e26f97AcCc0f6f0bA70b6304d89781449BAc11 diff --git a/ACL/nile_addresses.txt b/ACL/nile_addresses.txt deleted file mode 100644 index 524d086..0000000 --- a/ACL/nile_addresses.txt +++ /dev/null @@ -1,28 +0,0 @@ -Nile -Version=address -v0.5.1=0x38ba43fFa8C7715F0f2A5d52E78a392d2bD71176 -v0.5.2=0x31a64a1DCdD9e1b8db84ef94431a61C6B462Ad0c -v0.5.3=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.0=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.1=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.2=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.3=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.4=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.5=0x771136ebC55A1747B52722D1bb95323D98550293 -v0.6.6=0x416276914b5a6dd1b88bb0e35096200b08131113 -v0.6.7=0x416276914b5a6dd1b88bb0e35096200b08131113 -v0.6.8=0x416276914b5a6dd1b88bb0e35096200b08131113 -v0.6.9=0x416276914b5a6dd1b88bb0e35096200b08131113 -v0.6.10=0x6bd5fdc37b9c87ba73dda230e5dc18e9fda71ff9 -v0.6.11=0x2db2cec56a7ff5f330ee4c845c06043e1ff71c7f -v0.6.12=0x1be580a31d79a7facf1f5c70d8f2727f2ede75bd -v0.7.0=0x146becf5607b4daea1be310781ee20a84d232541 -v0.8.0=0x146becf5607b4daea1be310781ee20a84d232541 -v0.8.1=0x146becf5607b4daea1be310781ee20a84d232541 -v0.8.2=0x146becf5607b4daea1be310781ee20a84d232541 -v0.8.3=0x3195fCEb1F95006C77dBD957690224e047a1EdD9 -v0.8.4=0x3195fCEb1F95006C77dBD957690224e047a1EdD9 -v0.8.5=0x3195fCEb1F95006C77dBD957690224e047a1EdD9 -v0.8.6=0x5Ba6ce2dA741765C0BE7F36020c2cf45Fe114cB1 -v0.8.7=0x5Ba6ce2dA741765C0BE7F36020c2cf45Fe114cB1 -latest=0x5Ba6ce2dA741765C0BE7F36020c2cf45Fe114cB1 diff --git a/ACL/pacific_addresses.txt b/ACL/pacific_addresses.txt deleted file mode 100644 index d4d43a2..0000000 --- a/ACL/pacific_addresses.txt +++ /dev/null @@ -1,3 +0,0 @@ -Pacific -Version=address -latest=0x7FC6520Af3F0800d76A3e2FfE7b838c945ADBFE4 diff --git a/accounts/provider.json b/accounts/provider.json deleted file mode 100755 index 2226e59..0000000 --- a/accounts/provider.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/brizo.env b/brizo.env deleted file mode 100755 index ceebbe6..0000000 --- a/brizo.env +++ /dev/null @@ -1,10 +0,0 @@ -# Use this file to set the env vars required for Brizo. - -AZURE_ACCOUNT_NAME= -AZURE_ACCOUNT_KEY= -AZURE_RESOURCE_GROUP= -AZURE_LOCATION=westus -AZURE_CLIENT_ID= -AZURE_CLIENT_SECRET= -AZURE_TENANT_ID= -AZURE_SUBSCRIPTION_ID= diff --git a/compose-files/agent.yml b/compose-files/agent.yml deleted file mode 100644 index 8184609..0000000 --- a/compose-files/agent.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: '3' -services: - agent: - image: oceanprotocol/agent:$AGENT_VERSION - networks: - backend: - ipv4_address: 172.15.0.26 - ports: - - 4040:4040 - environment: - LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} - aquariusUri: ${AQUARIUS_URI} - brizoAddress: ${PROVIDER_ADDRESS} - nodeUri: ${KEEPER_RPC_URL} - brizoUri: ${BRIZO_URL} - secretstoreUri: ${SECRET_STORE_URL} - faucetUri: ${FAUCET_URL} - PRIVATE_KEY: ${AGENT_PRIVATE_KEY} - enable_publish: 'true' - enable_consume: 'true' - volumes: - - ${KEEPER_ARTIFACTS_FOLDER}:/usr/src/app/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro - - diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml index f18c3b0..266e31e 100644 --- a/compose-files/aquarius_elasticsearch.yml +++ b/compose-files/aquarius_elasticsearch.yml @@ -30,4 +30,5 @@ services: DB_CA_CERTS: ${DB_CA_CERTS} DB_CLIENT_KEY: ${DB_CLIENT_KEY} DB_CLIENT_CERT: ${DB_CLIENT_CERT} + LOG_LEVEL: DEBUG diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml deleted file mode 100644 index beda946..0000000 --- a/compose-files/brizo.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: '3' -services: - brizo: - image: oceanprotocol/brizo:$BRIZO_VERSION - ports: - - 8030:8030 - networks: - backend: - ipv4_address: 172.15.0.17 - depends_on: - - keeper-node - - secret-store-signing-node - env_file: - - ${BRIZO_ENV_FILE} - environment: - KEEPER_URL: ${KEEPER_RPC_URL} - PARITY_URL: ${SIGNING_NODE_URL} - LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} - SECRET_STORE_URL: ${SECRET_STORE_URL} - PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} - PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} - PROVIDER_KEYFILE: ${PROVIDER_KEYFILE} - LOG_LEVEL: ${BRIZO_LOG_LEVEL} - BRIZO_WORKERS: ${BRIZO_WORKERS} - IPFS_GATEWAY: ${BRIZO_IPFS_GATEWAY} - OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} - volumes: - - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - - ${ACCOUNTS_FOLDER}:/accounts diff --git a/compose-files/commons.yml b/compose-files/commons.yml deleted file mode 100644 index e79f173..0000000 --- a/compose-files/commons.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: '3' -services: - commonsserver: - image: oceanprotocol/commons_server:$COMMONS_SERVER_VERSION - networks: - backend: - ipv4_address: 172.15.0.23 - ports: - - 4000:4000 - environment: - IPFS_GATEWAY_URI: ${COMMONS_IPFS_GATEWAY_URI} - - commonsclient: - image: oceanprotocol/commons_client:$COMMONS_CLIENT_VERSION - networks: - backend: - ipv4_address: 172.15.0.24 - ports: - - 3000:3000 - depends_on: - - keeper-node - - aquarius - - brizo - - commonsserver - environment: - LISTEN_ADDRESS: '0.0.0.0' - LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} - REACT_APP_ALLOW_PRICING: 'true' - REACT_APP_SHOW_REQUEST_TOKENS_BUTTON: 'true' - REACT_APP_AQUARIUS_URI: ${COMMONS_AQUARIUS_URI} - REACT_APP_BRIZO_ADDRESS: ${PROVIDER_ADDRESS} - REACT_APP_SERVICE_URI: ${COMMONS_SERVER_URL} - REACT_APP_NODE_URI: ${COMMONS_KEEPER_RPC_HOST} - REACT_APP_BRIZO_URI: ${COMMONS_BRIZO_URL} - REACT_APP_SECRET_STORE_URI: ${COMMONS_SECRET_STORE_URL} - REACT_APP_FAUCET_URI: ${COMMONS_FAUCET_URL} - REACT_APP_IPFS_GATEWAY_URI: ${COMMONS_IPFS_GATEWAY_URI} - REACT_APP_IPFS_NODE_URI: ${COMMONS_IPFS_NODE_URI} - volumes: - - ${KEEPER_ARTIFACTS_FOLDER}:/app/frontend/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro - diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml deleted file mode 100644 index b3402f1..0000000 --- a/compose-files/events_handler.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3' -services: - events-handler: - image: oceanprotocol/events-handler:$EVENTS_HANDLER_VERSION - networks: - backend: - ipv4_address: 172.15.0.22 - depends_on: - - keeper-node - environment: - KEEPER_URL: ${KEEPER_RPC_URL} - PARITY_URL: ${SIGNING_NODE_URL} - SECRET_STORE_URL: ${SECRET_STORE_URL} - PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} - PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} - PROVIDER_KEYFILE: ${PROVIDER_KEYFILE} - LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} - LOG_LEVEL: ${EVENTS_HANDLER_LOG_LEVEL} - volumes: - - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - - ${ACCOUNTS_FOLDER}:/accounts diff --git a/compose-files/faucet.yml b/compose-files/faucet.yml deleted file mode 100644 index d3f06cf..0000000 --- a/compose-files/faucet.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: '3' -services: - mongodb: - image: mongo:4 - ports: - - 27017:27017 - networks: - backend: - ipv4_address: 172.15.0.20 - - faucet: - image: oceanprotocol/faucet:$FAUCET_VERSION - ports: - - 3001:3001 - networks: - backend: - ipv4_address: 172.15.0.21 - depends_on: - - mongodb - - keeper-node - environment: - FAUCET_NODE: ${KEEPER_RPC_URL} - FAUCET_TIMESPAN: ${FAUCET_TIMESPAN} - NODE_ENV: 'production' - MONGO_URL: 'mongodb://mongodb:27017/faucetdbtest' diff --git a/compose-files/keeper_contracts.yml b/compose-files/keeper_contracts.yml deleted file mode 100644 index 0251935..0000000 --- a/compose-files/keeper_contracts.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: '3' -services: - keeper-contracts: - image: oceanprotocol/keeper-contracts:$KEEPER_VERSION - networks: - backend: - ipv4_address: 172.15.0.14 - environment: - MNEMONIC: ${KEEPER_MNEMONIC} - OWNER_ROLE_ADDRESS: ${KEEPER_OWNER_ROLE_ADDRESS} - DEPLOY_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} - LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} - REUSE_DATABASE: ${GANACHE_REUSE_DATABASE} - DATABASE_PATH: "/ganache-db" - NETWORK_NAME: ${KEEPER_NETWORK_NAME} - KEEPER_RPC_HOST: ${KEEPER_RPC_HOST} - KEEPER_RPC_PORT: ${KEEPER_RPC_PORT} - KEEPER_RPC_URL: ${KEEPER_RPC_URL} - LOCAL_USER_ID: ${LOCAL_USER_ID} - LOCAL_GROUP_ID: ${LOCAL_GROUP_ID} - depends_on: - - keeper-node - volumes: - - ${KEEPER_ARTIFACTS_FOLDER}:/keeper-contracts/artifacts/ diff --git a/compose-files/network_volumes.yml b/compose-files/network_volumes.yml index 2fe878c..261f56c 100644 --- a/compose-files/network_volumes.yml +++ b/compose-files/network_volumes.yml @@ -7,9 +7,3 @@ networks: driver: default config: - subnet: 172.15.0.1/24 - -volumes: - keeper-node-duero: - keeper-node-nile: - keeper-node-pacific: - secret-store: diff --git a/compose-files/nodes/duero_node.yml b/compose-files/nodes/duero_node.yml deleted file mode 100644 index 624a495..0000000 --- a/compose-files/nodes/duero_node.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '3' -services: - keeper-node: - image: ${PARITY_IMAGE} - user: root - command: - --config /home/parity/parity/config/config.toml - --base-path /home/parity/base - --keys-path /keys - --ws-interface all - --jsonrpc-cors all - --jsonrpc-interface all - --jsonrpc-hosts all - --jsonrpc-apis all - volumes: - - ../networks/duero/config:/home/parity/parity/config - - ../networks/duero/keys:/keys/duero - - keeper-node-duero:/home/parity/base - ports: - - 8545:8545 - networks: - backend: - ipv4_address: 172.15.0.12 diff --git a/compose-files/nodes/ganache_node.yml b/compose-files/nodes/ganache_node.yml deleted file mode 100644 index 8b73eb5..0000000 --- a/compose-files/nodes/ganache_node.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '3' -services: - keeper-node: - image: trufflesuite/ganache-cli:latest - command: - -d - ports: - - 8545:8545 - networks: - backend: - ipv4_address: 172.15.0.12 diff --git a/compose-files/nodes/nile_node.yml b/compose-files/nodes/nile_node.yml deleted file mode 100644 index 6af2345..0000000 --- a/compose-files/nodes/nile_node.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '3' -services: - keeper-node: - image: ${PARITY_IMAGE} - user: root - command: - --config /home/parity/parity/config/config.toml - --base-path /home/parity/base - --keys-path /keys - --ws-interface all - --jsonrpc-cors all - --jsonrpc-interface all - --jsonrpc-hosts all - --jsonrpc-apis all - volumes: - - ../networks/nile/config:/home/parity/parity/config - - ../networks/nile/keys:/keys/nile - - keeper-node-nile:/home/parity/base - ports: - - 8545:8545 - networks: - backend: - ipv4_address: 172.15.0.12 diff --git a/compose-files/nodes/pacific_node.yml b/compose-files/nodes/pacific_node.yml deleted file mode 100644 index 27f70a6..0000000 --- a/compose-files/nodes/pacific_node.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '3' -services: - keeper-node: - image: ${PARITY_IMAGE} - user: root - command: - --config /home/parity/parity/config/config.toml - --base-path /home/parity/base - --keys-path /keys - --ws-interface all - --jsonrpc-cors all - --jsonrpc-interface all - --jsonrpc-hosts all - --jsonrpc-apis all - volumes: - - ../networks/pacific/config:/home/parity/parity/config - - ../networks/pacific/keys:/keys/pacific - - keeper-node-pacific:/home/parity/base - ports: - - 8545:8545 - networks: - backend: - ipv4_address: 172.15.0.12 diff --git a/compose-files/nodes/spree_node.yml b/compose-files/nodes/spree_node.yml deleted file mode 100644 index e30cbbc..0000000 --- a/compose-files/nodes/spree_node.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: '3' -services: - keeper-node: - image: ${PARITY_IMAGE} - command: - --config /home/parity/config/config.toml - --db-path /home/parity/chains - --keys-path /home/parity/.local/keys - --base-path /home/parity/base - --min-gas-price 0 - --jsonrpc-cors all - --jsonrpc-interface all - --jsonrpc-hosts all - --jsonrpc-apis all - --unsafe-expose - --no-warp - --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e - --node-key 0xb3244c104fb56d28d3979f6cd14a8b5cf5b109171d293f4454c97c173a9f9374 - volumes: - - ../networks/spree/config:/home/parity/config - - ../networks/spree/authorities/validator0.json:/home/parity/.local/keys/spree/validator.json - - ../networks/spree/keys:/home/parity/.local/keys/spree - - ../networks/spree/authorities/validator0.pwd:/home/parity/validator.pwd:ro - ports: - - 8545:8545 - networks: - backend: - ipv4_address: 172.15.0.12 diff --git a/compose-files/provider.yml b/compose-files/provider.yml new file mode 100644 index 0000000..c409232 --- /dev/null +++ b/compose-files/provider.yml @@ -0,0 +1,22 @@ +version: '3' +services: + provider: + image: oceanprotocol/provider-py:$PROVIDER_VERSION + ports: + - 8030:8030 + networks: + backend: + ipv4_address: 172.15.0.17 + environment: + NETWORK_URL: ${KEEPER_RPC_URL} + PARITY_URL: ${KEEPER_RPC_URL} + PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} + PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} + PROVIDER_KEYFILE_CONTENT: ${PROVIDER_KEYFILE_CONTENT} + LOG_LEVEL: ${PROVIDER_LOG_LEVEL} + OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030' + BRIZO_WORKERS: ${PROVIDER_WORKERS} + IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} + OCEAN_PROVIDER_TIMEOUT: '9000' + OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} + \ No newline at end of file diff --git a/compose-files/secret_store.yml b/compose-files/secret_store.yml deleted file mode 100644 index d6ec068..0000000 --- a/compose-files/secret_store.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: '3' -services: - secret-store: - image: oceanprotocol/parity-ethereum:master - entrypoint: /entrypoint.sh - environment: - CONFIGURE_ACL: "${CONFIGURE_ACL}" - ACL_CONTRACT_ADDRESS: "${ACL_CONTRACT_ADDRESS}" - NETWORK: "${KEEPER_NETWORK_NAME}" - command: - --chain /etc/parity/secretstore/chain_${KEEPER_NETWORK_NAME}.json - --config /etc/parity/secretstore/config.toml - --jsonrpc-cors all - --jsonrpc-interface all - --jsonrpc-hosts all - --jsonrpc-apis all - --node-key 0x32313aee5977ca63184b696e4cf7b7bfc2745f727dbef82d7a1f6314ad58dcf5 - -l secretstore_net,secretstore=trace - volumes: - - ../networks/secret-store/config/:/etc/parity/secretstore/ - - secret-store:/secret-store/ - - ../networks/secret-store/keys:/parity_data/keys - - ${KEEPER_ARTIFACTS_FOLDER}:/contracts - ports: - - 12000:12000 - - 12001 - networks: - backend: - ipv4_address: 172.15.0.13 - - secret-store-cors-proxy: - image: nginx:alpine - volumes: - - ../cors-proxy.conf:/etc/nginx/nginx.conf:ro - depends_on: - - secret-store - ports: - - 12001:12001 - networks: - backend: - ipv4_address: 172.15.0.16 - command: nginx -g 'daemon off;' diff --git a/compose-files/secret_store_signing_node.yml b/compose-files/secret_store_signing_node.yml deleted file mode 100644 index ceca8e1..0000000 --- a/compose-files/secret_store_signing_node.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3' -services: - secret-store-signing-node: - image: ${PARITY_IMAGE} - command: - --chain dev - --light - --ws-interface all - --jsonrpc-cors all - --jsonrpc-interface all - --jsonrpc-hosts all - --jsonrpc-apis all - --keys-path /home/parity/.local/keys - ports: - - 9545:8545 - volumes: - - ../networks/secret-store/keys:/home/parity/.local/keys - - ../networks/secret-store/config/:/etc/parity/secretstore/ - networks: - backend: - ipv4_address: 172.15.0.18 diff --git a/cors-proxy.conf b/cors-proxy.conf deleted file mode 100644 index a57cd59..0000000 --- a/cors-proxy.conf +++ /dev/null @@ -1,29 +0,0 @@ -events {} -http { - upstream ss { - server secret-store:12001; - } - server { - listen 12001; - location ~ ^/ { - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow_Credentials' 'true'; - add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Content-Type' 'text/plain; charset=utf-8'; - add_header 'Content-Length' 0; - return 204; - } - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow_Credentials' 'true'; - add_header 'Access-Control-Allow-Headers' 'Origin, X-Requested-With, Content-Type, Accept'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - proxy_pass http://ss; - proxy_redirect off; - proxy_set_header Origin ""; - } - access_log off; - error_log off; - } -} \ No newline at end of file diff --git a/networks/duero/authorities/validator0.json b/networks/duero/authorities/validator0.json deleted file mode 100644 index 15d6d06..0000000 --- a/networks/duero/authorities/validator0.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "6a829fe7bc656d85f6c2e9fd21784952" - }, - "ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5" - }, - "mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986" - }, - "address": "00bd138abd70e2f00903268f3db08f2d25677c9e", - "name": "Validator0", - "meta": "{}" -} diff --git a/networks/duero/authorities/validator0.pwd b/networks/duero/authorities/validator0.pwd deleted file mode 100644 index ce118da..0000000 --- a/networks/duero/authorities/validator0.pwd +++ /dev/null @@ -1 +0,0 @@ -node0 diff --git a/networks/duero/config/chain.json b/networks/duero/config/chain.json deleted file mode 100644 index 0c31d6f..0000000 --- a/networks/duero/config/chain.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "duero", - "engine": { - "authorityRound": { - "params": { - "stepDuration": "5", - "validators": { - "multi": { - "0": { - "list": [ - "0xdcb7ff1b9fd738a47eaf9b2e0b3d817b1da92781", - "0x3e10ae74970da70b706e768eead37b712a698941", - "0x0179e19cd246bb7bdec2c998ae0d8307a7eddbc5" - ] - }, - "333": { - "safeContract": "0xBDFeAc66c022165Bdb320264398977bf8A54e3C0" - }, - "13333": { - "safeContract": "0x4Eb388C190Cde6Bf8C60e37CCd2C8056A184eD43" - } - } - } - } - } - }, - "params": { - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x897", - "gasLimitBoundDivisor": "0x400", - "eip140Transition": "0x0", - "eip211Transition": "0x0", - "eip214Transition": "0x0", - "eip658Transition": "0x0", - "wasmActivationTransition": "0x0", - "eip145Transition": "0x0", - "eip1014Transition": "0x0", - "eip1052Transition": "0x0", - "eip1283Transition": "0x0", - "kip4Transition": "0x0", - "kip6Transition": "0x0", - "maxCodeSize": 24576, - "maxCodeSizeTransition": "0x0" - }, - "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 - } - } - } - }, - "0xf5d60efcad44babc8d85eb8df57d9e3a5101eb93": { - "balance": "0x2000000000000000000" - }, - "0x61f9546cd2bd5e46bdb915ab9c69210c6ee043d2": { - "balance": "0x2000000000000000000" - }, - "0x8d968b9bc8fe3b1d233ae6238c771544dd7c8fb2": { - "balance": "0x2000000000000000000" - }, - "0x63132a33765fe352187c93e45fac1b9162399e5c": { - "balance": "0x2000000000000000000" - }, - "0x95a165da81359c11aafb4490fe6afeb6ee4f7c2e": { - "balance": "0x2000000000000000000" - }, - "0x9224dff492427471092d13b36866875d7e0f2dd6": { - "balance": "0x2000000000000000000" - }, - "0x9aa9bfa819800a44803dcacc514bb443a2baade6": { - "balance": "0x2000000000000000000" - }, - "0x85ef014983c1bad421cc00941c18122066da5860": { - "balance": "0x2000000000000000000" - }, - "0xc6fffcb664a60c019a335902112584829a91c0a0": { - "balance": "0x2000000000000000000" - }, - "0xdbb63fb51453714f5efed3c2846160018fb3f43c": { - "balance": "0x2000000000000000000" - }, - "0x23be64786fe4467635e65aea49f9dd7a0b05d7b5": { - "balance": "0x2000000000000000000" - }, - "0x3c80c7163c1e6730f2ba80df707178dcdee44475": { - "balance": "0x2000000000000000000" - }, - "0xe49c5f9c8a78884c8ba2aa161b8c41bf21b96751": { - "balance": "0x2000000000000000000" - }, - "0xf7f2673e854e7b33a62beec796dec5d61ac9c40a": { - "balance": "0x2000000000000000000" - }, - "0xe739ed3643970d106c4b1c51de91b7992400e50c": { - "balance": "0x2000000000000000000" - }, - "0x85a7273ff4f4ffce0c708f47ab45249867679bcf": { - "balance": "0x2000000000000000000" - }, - "0x4156e7abdfe6e08c16ef2b241661276af57f9ead": { - "balance": "0x2000000000000000000" - }, - "0x480b0e0a641ae45521377d4984d085a003934561": { - "balance": "0x200000000000000000000000" - }, - "0xb08eb95236499f072b2ae3c91a8f911d6c853b4d": { - "balance": "0x200000000000000000000000" - }, - "0x4899f06b5e60140f1885599bf3a562cb25775adc": { - "balance": "0x200000000000000000000000" - } - }, - "nodes": [ - "enode://1ac6d74bbd80a37c1dc75bddc78462922d8df6b6243c2e1b38ff250ae57d11ad37bbfcc65fcbb7c0ae22da1de5e516c00ddf98253701db18fe7280ca6b8b45d2@3.214.8.88:30303", - "enode://d081a7cebb62ba4a93cbdc96a22779168d8583266fe94a859a40ceb85cf8a056aeabf82c43f2ba35e4eeaf61c34fa8a873b1f16906dfcc0d512cb29e316d696a@3.95.88.145:30303", - "enode://d7fc9a3c23f9926321b81ff32ac130bdce185edb7be6fa33375ad18162de1faee894d0e671077e139295cbc609b036804a05d8353ea32b9c963bced2aeda951f@34.193.207.38:30303", - "enode://16baffd0d7f8ddd77c5ac21902bdb3ae6fa9e17f2449a579e5f2db0b8701e451c7d27225319cb15628791d4d19f3fcb7c2e2c6b8757ab195eb65d7c347c9530c@23.22.141.34:30303", - "enode://f05c1d338edbfbba711118a4ac8ecc37dba436289ecf86361664ef9fe4659e31f668ff23982e9afcf60e8059b23fa6b0f0bce4e8dcfef3e7507c168d62d4d98b@3.214.59.4:30303", - "enode://7d582bb66161906100679e079676f12109e5e73731c28a0d23d7c36ece46acd0a307add1b0c38931441c7dbffd5f0ae5507427523e9e3ea875b1ee43097d5b8d@3.213.32.155:30303" - ] -} - diff --git a/networks/duero/config/config.toml b/networks/duero/config/config.toml deleted file mode 100644 index 168e05d..0000000 --- a/networks/duero/config/config.toml +++ /dev/null @@ -1,16 +0,0 @@ -# Users config file in users.toml -# This configuration file can be used for either Alice, Bob or Charlie - -[parity] -chain = "/home/parity/parity/config/chain.json" - -[rpc] -port = 8545 -interface = "0.0.0.0" -cors = ["all"] -hosts = ["all"] -apis = ["web3", "eth", "pubsub", "net", "parity", "parity_pubsub", "parity_accounts", "traces", "rpc", "shh", "shh_pubsub"] - -[network] -port = 30303 -discovery = true diff --git a/networks/duero/keys/address_book.json b/networks/duero/keys/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/duero/keys/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/duero/keys/consumer.json b/networks/duero/keys/consumer.json deleted file mode 100644 index 15d6d06..0000000 --- a/networks/duero/keys/consumer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "6a829fe7bc656d85f6c2e9fd21784952" - }, - "ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5" - }, - "mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986" - }, - "address": "00bd138abd70e2f00903268f3db08f2d25677c9e", - "name": "Validator0", - "meta": "{}" -} diff --git a/networks/duero/keys/publisher.json b/networks/duero/keys/publisher.json deleted file mode 100755 index 2226e59..0000000 --- a/networks/duero/keys/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/nile/authorities/validator0.json b/networks/nile/authorities/validator0.json deleted file mode 100644 index 6b052f6..0000000 --- a/networks/nile/authorities/validator0.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "4dd5c7e5-9721-818d-10ec-71a3385535cc", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "cadcbca6144821fd98e27a6d1934c1ca" - }, - "ciphertext": "df7d6c70d239b615704e10dd2ae3bea40c620cd597eaf5bb617021d3eb0a2d6e", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "5153f76a1db028354818211dfdf21257cf227b5b394e36debe8a8fdaeb22b943" - }, - "mac": "ec893276eadaee70648a9a173f732895f56c7819b7a5fe0758110c9a83899aa4" - }, - "address": "4899e89ab14a87e805954c86b32eb7c62bc7ab9a", - "name": "", - "meta": "{}" -} diff --git a/networks/nile/authorities/validator0.pwd b/networks/nile/authorities/validator0.pwd deleted file mode 100644 index 8b13789..0000000 --- a/networks/nile/authorities/validator0.pwd +++ /dev/null @@ -1 +0,0 @@ - diff --git a/networks/nile/config/chain.json b/networks/nile/config/chain.json deleted file mode 100644 index 07828b7..0000000 --- a/networks/nile/config/chain.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "nile", - "engine": { - "authorityRound": { - "params": { - "stepDuration": "5", - "validators": { - "multi": { - "0": { - "list": [ - "0xa1345ed0b2d1e193aead673e33dac56515af128a", - "0xf4a2dbd5d67ef3019a7e4b188b92128c86d76bf9", - "0xcdbe5f61fac89e2cfcfa3727805d5cb8bc4f9afd" - ] - }, - "1079300": { - "safeContract": "0xA060De254f9175D7Fa17DA41434E4920CCa30a2A" - } - } - }, - "validateScoreTransition": 1000000000, - "validateStepTransition": 1500000000, - "maximumUncleCount": 1000000000 - } - } - }, - "params": { - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x2323", - "gasLimitBoundDivisor": "0x400", - "eip140Transition": "0x0", - "eip211Transition": "0x0", - "eip214Transition": "0x0", - "eip658Transition": "0x0", - "wasmActivationTransition": "1079100", - "eip145Transition": "1079100", - "eip1014Transition": "1079100", - "eip1052Transition": "1079100", - "eip1283Transition": "1079100", - "kip4Transition": "1079100", - "kip6Transition": "1079100", - "maxCodeSize": 24576, - "maxCodeSizeTransition": "1079100" - }, - "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 - } - } - } - }, - "0xf5d60efcad44babc8d85eb8df57d9e3a5101eb93": { - "balance": "0x2000000000000000000" - }, - "0x61f9546cd2bd5e46bdb915ab9c69210c6ee043d2": { - "balance": "0x2000000000000000000" - }, - "0x8d968b9bc8fe3b1d233ae6238c771544dd7c8fb2": { - "balance": "0x2000000000000000000" - }, - "0x63132a33765fe352187c93e45fac1b9162399e5c": { - "balance": "0x2000000000000000000" - }, - "0x95a165da81359c11aafb4490fe6afeb6ee4f7c2e": { - "balance": "0x2000000000000000000" - }, - "0x9224dff492427471092d13b36866875d7e0f2dd6": { - "balance": "0x2000000000000000000" - }, - "0x9aa9bfa819800a44803dcacc514bb443a2baade6": { - "balance": "0x2000000000000000000" - }, - "0x85ef014983c1bad421cc00941c18122066da5860": { - "balance": "0x2000000000000000000" - }, - "0xc6fffcb664a60c019a335902112584829a91c0a0": { - "balance": "0x2000000000000000000" - }, - "0xdbb63fb51453714f5efed3c2846160018fb3f43c": { - "balance": "0x2000000000000000000" - }, - "0x23be64786fe4467635e65aea49f9dd7a0b05d7b5": { - "balance": "0x2000000000000000000" - }, - "0x3c80c7163c1e6730f2ba80df707178dcdee44475": { - "balance": "0x2000000000000000000" - }, - "0xe49c5f9c8a78884c8ba2aa161b8c41bf21b96751": { - "balance": "0x2000000000000000000" - }, - "0xf7f2673e854e7b33a62beec796dec5d61ac9c40a": { - "balance": "0x2000000000000000000" - }, - "0xe739ed3643970d106c4b1c51de91b7992400e50c": { - "balance": "0x2000000000000000000" - }, - "0x85a7273ff4f4ffce0c708f47ab45249867679bcf": { - "balance": "0x2000000000000000000" - }, - "0x4156e7abdfe6e08c16ef2b241661276af57f9ead": { - "balance": "0x2000000000000000000" - }, - "0x480b0e0a641ae45521377d4984d085a003934561": { - "balance": "0x200000000000000000000000" - }, - "0xb08eb95236499f072b2ae3c91a8f911d6c853b4d": { - "balance": "0x200000000000000000000000" - }, - "0x4899f06b5e60140f1885599bf3a562cb25775adc": { - "balance": "0x200000000000000000000000" - } - }, - "nodes": [ - "enode://e90d77ad3065d0767abe08cdd47746c29fae578e8d1c06aacc30da720dd7fd8c8aa0e1e2ca2bb20c4739edff82e5e7405a382cf17af6a4366e2540f72e46e829@18.210.120.241:30303", - "enode://204b11794d16f382bab24a7cdde5ec1273b8c6c2b23e64560d7ef1707708158a45300e920607aa413633e45c5eea472c17f474866ce5901515249abfbe9c4e1c@35.171.30.2:30303", - "enode://6881fbbf8f2400c05c61b696af7bb2be04ab22ce64d5221906b9c1c67f2bf976b71cd1d98be7743dfc139a7b590fe230212195714e71f2204252caf68f6f94c0@54.163.9.188:30303", - "enode://2676315c9bc954a275b949b4b77300b694d9829b120dab36e7f125dc790a754e97e1100173a2f8ebe6390c87539424e71774996d823bc9d65b262258877a1353@52.1.94.55:30303", - "enode://5ca724b86ae77e84af2a187f209ee84eb47991689cce6088d6f35b7aa8f50c1bfc74fa5d3f9360da733bef6103c09cf3d8dc956637dd6a7fa7fb69797af0e133@54.156.6.164:30303", - "enode://6ffb46bfefb6ed24d3626a431b367819c01916272ee10caab791ff19b38e9f7ff904566f6ba83fd24591e66cb3d9ac8b24b8be7e157486b5d23ce0c473c628a4@100.24.158.252:30303" - ] -} - diff --git a/networks/nile/config/config.toml b/networks/nile/config/config.toml deleted file mode 100644 index 168e05d..0000000 --- a/networks/nile/config/config.toml +++ /dev/null @@ -1,16 +0,0 @@ -# Users config file in users.toml -# This configuration file can be used for either Alice, Bob or Charlie - -[parity] -chain = "/home/parity/parity/config/chain.json" - -[rpc] -port = 8545 -interface = "0.0.0.0" -cors = ["all"] -hosts = ["all"] -apis = ["web3", "eth", "pubsub", "net", "parity", "parity_pubsub", "parity_accounts", "traces", "rpc", "shh", "shh_pubsub"] - -[network] -port = 30303 -discovery = true diff --git a/networks/nile/keys/address_book.json b/networks/nile/keys/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/nile/keys/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/nile/keys/publisher.json b/networks/nile/keys/publisher.json deleted file mode 100755 index 2226e59..0000000 --- a/networks/nile/keys/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/pacific/config/chain.json b/networks/pacific/config/chain.json deleted file mode 100644 index 0953f1b..0000000 --- a/networks/pacific/config/chain.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "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/pacific/config/config.toml b/networks/pacific/config/config.toml deleted file mode 100644 index 57256ef..0000000 --- a/networks/pacific/config/config.toml +++ /dev/null @@ -1,17 +0,0 @@ -# Users config file in users.toml -# This configuration file can be used for either Alice, Bob or Charlie - -[parity] -chain = "/home/parity/parity/config/chain.json" - -[rpc] -port = 8545 -interface = "0.0.0.0" -cors = ["all"] -hosts = ["all"] -apis = ["web3", "eth", "pubsub", "net", "parity", "parity_pubsub", "parity_accounts", "traces", "rpc", "shh", "shh_pubsub"] - -[network] -port = 30303 -discovery = true - diff --git a/networks/pacific/keys/address_book.json b/networks/pacific/keys/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/pacific/keys/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/pacific/keys/publisher.json b/networks/pacific/keys/publisher.json deleted file mode 100755 index 2226e59..0000000 --- a/networks/pacific/keys/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/config/chain_duero.json b/networks/secret-store/config/chain_duero.json deleted file mode 100644 index 0c31d6f..0000000 --- a/networks/secret-store/config/chain_duero.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "name": "duero", - "engine": { - "authorityRound": { - "params": { - "stepDuration": "5", - "validators": { - "multi": { - "0": { - "list": [ - "0xdcb7ff1b9fd738a47eaf9b2e0b3d817b1da92781", - "0x3e10ae74970da70b706e768eead37b712a698941", - "0x0179e19cd246bb7bdec2c998ae0d8307a7eddbc5" - ] - }, - "333": { - "safeContract": "0xBDFeAc66c022165Bdb320264398977bf8A54e3C0" - }, - "13333": { - "safeContract": "0x4Eb388C190Cde6Bf8C60e37CCd2C8056A184eD43" - } - } - } - } - } - }, - "params": { - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x897", - "gasLimitBoundDivisor": "0x400", - "eip140Transition": "0x0", - "eip211Transition": "0x0", - "eip214Transition": "0x0", - "eip658Transition": "0x0", - "wasmActivationTransition": "0x0", - "eip145Transition": "0x0", - "eip1014Transition": "0x0", - "eip1052Transition": "0x0", - "eip1283Transition": "0x0", - "kip4Transition": "0x0", - "kip6Transition": "0x0", - "maxCodeSize": 24576, - "maxCodeSizeTransition": "0x0" - }, - "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 - } - } - } - }, - "0xf5d60efcad44babc8d85eb8df57d9e3a5101eb93": { - "balance": "0x2000000000000000000" - }, - "0x61f9546cd2bd5e46bdb915ab9c69210c6ee043d2": { - "balance": "0x2000000000000000000" - }, - "0x8d968b9bc8fe3b1d233ae6238c771544dd7c8fb2": { - "balance": "0x2000000000000000000" - }, - "0x63132a33765fe352187c93e45fac1b9162399e5c": { - "balance": "0x2000000000000000000" - }, - "0x95a165da81359c11aafb4490fe6afeb6ee4f7c2e": { - "balance": "0x2000000000000000000" - }, - "0x9224dff492427471092d13b36866875d7e0f2dd6": { - "balance": "0x2000000000000000000" - }, - "0x9aa9bfa819800a44803dcacc514bb443a2baade6": { - "balance": "0x2000000000000000000" - }, - "0x85ef014983c1bad421cc00941c18122066da5860": { - "balance": "0x2000000000000000000" - }, - "0xc6fffcb664a60c019a335902112584829a91c0a0": { - "balance": "0x2000000000000000000" - }, - "0xdbb63fb51453714f5efed3c2846160018fb3f43c": { - "balance": "0x2000000000000000000" - }, - "0x23be64786fe4467635e65aea49f9dd7a0b05d7b5": { - "balance": "0x2000000000000000000" - }, - "0x3c80c7163c1e6730f2ba80df707178dcdee44475": { - "balance": "0x2000000000000000000" - }, - "0xe49c5f9c8a78884c8ba2aa161b8c41bf21b96751": { - "balance": "0x2000000000000000000" - }, - "0xf7f2673e854e7b33a62beec796dec5d61ac9c40a": { - "balance": "0x2000000000000000000" - }, - "0xe739ed3643970d106c4b1c51de91b7992400e50c": { - "balance": "0x2000000000000000000" - }, - "0x85a7273ff4f4ffce0c708f47ab45249867679bcf": { - "balance": "0x2000000000000000000" - }, - "0x4156e7abdfe6e08c16ef2b241661276af57f9ead": { - "balance": "0x2000000000000000000" - }, - "0x480b0e0a641ae45521377d4984d085a003934561": { - "balance": "0x200000000000000000000000" - }, - "0xb08eb95236499f072b2ae3c91a8f911d6c853b4d": { - "balance": "0x200000000000000000000000" - }, - "0x4899f06b5e60140f1885599bf3a562cb25775adc": { - "balance": "0x200000000000000000000000" - } - }, - "nodes": [ - "enode://1ac6d74bbd80a37c1dc75bddc78462922d8df6b6243c2e1b38ff250ae57d11ad37bbfcc65fcbb7c0ae22da1de5e516c00ddf98253701db18fe7280ca6b8b45d2@3.214.8.88:30303", - "enode://d081a7cebb62ba4a93cbdc96a22779168d8583266fe94a859a40ceb85cf8a056aeabf82c43f2ba35e4eeaf61c34fa8a873b1f16906dfcc0d512cb29e316d696a@3.95.88.145:30303", - "enode://d7fc9a3c23f9926321b81ff32ac130bdce185edb7be6fa33375ad18162de1faee894d0e671077e139295cbc609b036804a05d8353ea32b9c963bced2aeda951f@34.193.207.38:30303", - "enode://16baffd0d7f8ddd77c5ac21902bdb3ae6fa9e17f2449a579e5f2db0b8701e451c7d27225319cb15628791d4d19f3fcb7c2e2c6b8757ab195eb65d7c347c9530c@23.22.141.34:30303", - "enode://f05c1d338edbfbba711118a4ac8ecc37dba436289ecf86361664ef9fe4659e31f668ff23982e9afcf60e8059b23fa6b0f0bce4e8dcfef3e7507c168d62d4d98b@3.214.59.4:30303", - "enode://7d582bb66161906100679e079676f12109e5e73731c28a0d23d7c36ece46acd0a307add1b0c38931441c7dbffd5f0ae5507427523e9e3ea875b1ee43097d5b8d@3.213.32.155:30303" - ] -} - diff --git a/networks/secret-store/config/chain_nile.json b/networks/secret-store/config/chain_nile.json deleted file mode 100644 index 78c369e..0000000 --- a/networks/secret-store/config/chain_nile.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "name": "nile", - "engine": { - "authorityRound": { - "params": { - "stepDuration": "5", - "validators": { - "list": [ - "0xa1345ed0b2d1e193aead673e33dac56515af128a", - "0xf4a2dbd5d67ef3019a7e4b188b92128c86d76bf9", - "0xcdbe5f61fac89e2cfcfa3727805d5cb8bc4f9afd" - ] - }, - "validateScoreTransition": 1000000000, - "validateStepTransition": 1500000000, - "maximumUncleCount": 1000000000 - } - } - }, - "params": { - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x2323", - "gasLimitBoundDivisor": "0x400", - "eip140Transition": 0, - "eip211Transition": 0, - "eip214Transition": 0, - "eip658Transition": 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 - } - } - } - }, - "0xf5d60efcad44babc8d85eb8df57d9e3a5101eb93": { - "balance": "0x2000000000000000000" - }, - "0x61f9546cd2bd5e46bdb915ab9c69210c6ee043d2": { - "balance": "0x2000000000000000000" - }, - "0x8d968b9bc8fe3b1d233ae6238c771544dd7c8fb2": { - "balance": "0x2000000000000000000" - }, - "0x63132a33765fe352187c93e45fac1b9162399e5c": { - "balance": "0x2000000000000000000" - }, - "0x95a165da81359c11aafb4490fe6afeb6ee4f7c2e": { - "balance": "0x2000000000000000000" - }, - "0x9224dff492427471092d13b36866875d7e0f2dd6": { - "balance": "0x2000000000000000000" - }, - "0x9aa9bfa819800a44803dcacc514bb443a2baade6": { - "balance": "0x2000000000000000000" - }, - "0x85ef014983c1bad421cc00941c18122066da5860": { - "balance": "0x2000000000000000000" - }, - "0xc6fffcb664a60c019a335902112584829a91c0a0": { - "balance": "0x2000000000000000000" - }, - "0xdbb63fb51453714f5efed3c2846160018fb3f43c": { - "balance": "0x2000000000000000000" - }, - "0x23be64786fe4467635e65aea49f9dd7a0b05d7b5": { - "balance": "0x2000000000000000000" - }, - "0x3c80c7163c1e6730f2ba80df707178dcdee44475": { - "balance": "0x2000000000000000000" - }, - "0xe49c5f9c8a78884c8ba2aa161b8c41bf21b96751": { - "balance": "0x2000000000000000000" - }, - "0xf7f2673e854e7b33a62beec796dec5d61ac9c40a": { - "balance": "0x2000000000000000000" - }, - "0xe739ed3643970d106c4b1c51de91b7992400e50c": { - "balance": "0x2000000000000000000" - }, - "0x85a7273ff4f4ffce0c708f47ab45249867679bcf": { - "balance": "0x2000000000000000000" - }, - "0x4156e7abdfe6e08c16ef2b241661276af57f9ead": { - "balance": "0x2000000000000000000" - }, - "0x480b0e0a641ae45521377d4984d085a003934561": { - "balance": "0x200000000000000000000000" - }, - "0xb08eb95236499f072b2ae3c91a8f911d6c853b4d": { - "balance": "0x200000000000000000000000" - }, - "0x4899f06b5e60140f1885599bf3a562cb25775adc": { - "balance": "0x200000000000000000000000" - } - }, - "nodes": [ - "enode://e90d77ad3065d0767abe08cdd47746c29fae578e8d1c06aacc30da720dd7fd8c8aa0e1e2ca2bb20c4739edff82e5e7405a382cf17af6a4366e2540f72e46e829@18.210.120.241:30303", - "enode://204b11794d16f382bab24a7cdde5ec1273b8c6c2b23e64560d7ef1707708158a45300e920607aa413633e45c5eea472c17f474866ce5901515249abfbe9c4e1c@35.171.30.2:30303", - "enode://6881fbbf8f2400c05c61b696af7bb2be04ab22ce64d5221906b9c1c67f2bf976b71cd1d98be7743dfc139a7b590fe230212195714e71f2204252caf68f6f94c0@54.163.9.188:30303", - "enode://2676315c9bc954a275b949b4b77300b694d9829b120dab36e7f125dc790a754e97e1100173a2f8ebe6390c87539424e71774996d823bc9d65b262258877a1353@52.1.94.55:30303", - "enode://5ca724b86ae77e84af2a187f209ee84eb47991689cce6088d6f35b7aa8f50c1bfc74fa5d3f9360da733bef6103c09cf3d8dc956637dd6a7fa7fb69797af0e133@54.156.6.164:30303", - "enode://6ffb46bfefb6ed24d3626a431b367819c01916272ee10caab791ff19b38e9f7ff904566f6ba83fd24591e66cb3d9ac8b24b8be7e157486b5d23ce0c473c628a4@100.24.158.252:30303" - ] -} diff --git a/networks/secret-store/config/chain_pacific.json b/networks/secret-store/config/chain_pacific.json deleted file mode 100644 index 0953f1b..0000000 --- a/networks/secret-store/config/chain_pacific.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "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/config/chain_spree.json b/networks/secret-store/config/chain_spree.json deleted file mode 100644 index a75aa33..0000000 --- a/networks/secret-store/config/chain_spree.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "name": "spree", - "engine": { - "authorityRound": { - "params": { - "stepDuration": "1", - "validators": { - "list": [ - "0x00bd138abd70e2f00903268f3db08f2d25677c9e", - "0x002e28950558fbede1a9675cb113f0bd20912019", - "0x00aa39d30f0d20ff03a22ccfc30b7efbfca597c2" - ] - }, - "validateScoreTransition": 1000000000, - "validateStepTransition": 1500000000, - "maximumUncleCount": 1000000000 - } - } - }, - "params": { - "gasLimitBoundDivisor": "0x0400", - "accountStartNonce": "0x0", - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x2324", - "eip140Transition": "0x0", - "eip211Transition": "0x0", - "eip214Transition": "0x0", - "eip658Transition": "0x0", - "wasmActivationTransition": "0x0", - "eip145Transition": "0x0", - "eip1014Transition": "0x0", - "eip1052Transition": "0x0", - "eip1283Transition": "0x0", - "kip4Transition": "0x0", - "kip6Transition": "0x0" - }, - "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 - } - } - } - }, - "0x0000000000000000000000000000000000000005": { - "balance": "1", - "builtin": { - "name": "modexp", - "activate_at": 0, - "pricing": { - "modexp": { - "divisor": 20 - } - } - } - }, - "0x0000000000000000000000000000000000000006": { - "balance": "1", - "builtin": { - "name": "alt_bn128_add", - "activate_at": 0, - "pricing": { - "linear": { - "base": 500, - "word": 0 - } - } - } - }, - "0x0000000000000000000000000000000000000007": { - "balance": "1", - "builtin": { - "name": "alt_bn128_mul", - "activate_at": 0, - "pricing": { - "linear": { - "base": 40000, - "word": 0 - } - } - } - }, - "0x0000000000000000000000000000000000000008": { - "balance": "1", - "builtin": { - "name": "alt_bn128_pairing", - "activate_at": 0, - "pricing": { - "alt_bn128_pairing": { - "base": 100000, - "pair": 80000 - } - } - } - }, - "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xA99D43d86A0758d5632313b8fA3972B6088A21BB": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xA78deb2Fa79463945C247991075E2a0e98Ba7A09": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x02354A1F160A3fd7ac8b02ee91F04104440B28E7": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x529043886F21D9bc1AE0feDb751e34265a246e47": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xe08A1dAe983BC701D05E492DB80e0144f8f4b909": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xbcE5A3468386C64507D30136685A99cFD5603135": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x8af7d4d2ede31794b103235b9adadc85d3e190a8": { - "balance": "0x10000000000000000" - }, - "0xa406c48e08a32384abc1c22d061d3a4e22a87901": { - "balance": "0x10000000000000000" - }, - "0xc285101e2ff7388ebeaaceb7722584e8b90cb51b": { - "balance": "0x10000000000000000" - }, - "0x29d34d35098443ca6855602d45aab7eb2606c990": { - "balance": "0x10000000000000000" - }, - "0x9a72c513197f4560539046a27e1324785485e1cc": { - "balance": "0x10000000000000000" - }, - "0xa209091ae3fc83bb5cad8fff0ffa8ce0157b0183": { - "balance": "0x10000000000000000" - }, - "0x8ec02f9eeae938a9031bf57da3d9f1a1173c79ac": { - "balance": "0x10000000000000000" - }, - "0x58b0321da73f8faeffc08774d9bb961d5c875c78": { - "balance": "0x10000000000000000" - }, - "0xb40e42ded3b92f425c71ab3a727212614843d0d7": { - "balance": "0x10000000000000000" - }, - "0x14436aa3f96bf3a1628f43f7efc9e62292698a32": { - "balance": "0x10000000000000000" - }, - "0xafc8e581af80aeec3eb218373595befcf060bb93": { - "balance": "0x10000000000000000" - }, - "0xe8eca5571b304c5f4004c4793bfb7bcbba9307a8": { - "balance": "0x10000000000000000" - }, - "0x68be5a46e0d4c0b88610e6a6d52ced72975cc305": { - "balance": "0x10000000000000000" - }, - "0x98d50e062c277da127f4d17529996e20f1bcf3e3": { - "balance": "0x10000000000000000" - }, - "0x207595bc37dbac843e904f3925258244a6cdc571": { - "balance": "0x10000000000000000" - }, - "0x5f8540e90728ee064dd0f761fc14587c2be7f77f": { - "balance": "0x10000000000000000" - }, - "0xb353b58b5ff997375a30475489246d9fcad592b0": { - "balance": "0x10000000000000000" - }, - "0x4c44474a9d85431bf1b3f4e7de4598f9aa07e074": { - "balance": "0x10000000000000000" - }, - "0x76da1b5f8ac66528a7f5a0745f8557987309ff5c": { - "balance": "0x10000000000000000" - }, - "0x983108aa053a22b73f61354b708d3a8be6a66b04": { - "balance": "0x10000000000000000" - }, - "0x237e71abb676cfbdff74a09d058310ef8ba94c92": { - "balance": "0x10000000000000000" - }, - "0xf5327433c8bb9c374477efd30fd4f993cb6d4749": { - "balance": "0x10000000000000000" - }, - "0xca0b9b8b30f759c3c6ab62531fab1f14b67d9022": { - "balance": "0x10000000000000000" - }, - "0x5a4e71e6809e6903353b562fdd0d3a80fa36f6c3": { - "balance": "0x10000000000000000" - }, - "0x0e69f59bfecb92f5622e2e39793acd2bd85c6987": { - "balance": "0x10000000000000000" - }, - "0x5667d26d1e73bacbeab8a8a7bee1ace4b9818f31": { - "balance": "0x10000000000000000" - }, - "0x8ad77062ea7af6f322bfc0b3bd969bbf1d072015": { - "balance": "0x10000000000000000" - }, - "0x2760e6fabff121101747121228d73506c5e05b71": { - "balance": "0x10000000000000000" - }, - "0xa74a0ff8dff5420319c76e9e1f8eec9fea550d33": { - "balance": "0x10000000000000000" - }, - "0x437270c005837c1e585f9dd8e6a04ceefe2f0ee8": { - "balance": "0x10000000000000000" - }, - "0x3b18ebbaabd7fa7cf97c7b9cbc3ec3717de9a86d": { - "balance": "0x10000000000000000" - }, - "0x68a03dcc60d113ecd334474236606f03c1da316a": { - "balance": "0x10000000000000000" - }, - "0xffbb1177d9ebc94ecaec6adc7c5d824afb22a4a8": { - "balance": "0x10000000000000000" - }, - "0x51ee02ef590b0479387343429b7d19b8aba0cd18": { - "balance": "0x10000000000000000" - }, - "0x5ca985715a657e89ee7f8d06d98b419224a5a523": { - "balance": "0x10000000000000000" - }, - "0x45fde4de4b1ab2240f52790ab7afadcb6fc256af": { - "balance": "0x10000000000000000" - }, - "0x04f86c8ce00fe2534fa47eecc4737f3c1c7cc5f6": { - "balance": "0x10000000000000000" - }, - "0x168b2ac464bf73739843fd8cd71f7471224464dc": { - "balance": "0x10000000000000000" - }, - "0x835b5e6f655fe0fdee77ec4f944093a81ff3a649": { - "balance": "0x10000000000000000" - }, - "0xb80ca71cdc15342209e1bd90b5e30f5c26b2cd3d": { - "balance": "0x10000000000000000" - }, - "0x0d0d6e34cfc9445630b21c5e78c097d29ac59787": { - "balance": "0x10000000000000000" - }, - "0xb7a12710bb510ce851b6ba1e65185e4473ffc587": { - "balance": "0x10000000000000000" - }, - "0x94e7a08bbaea3453b7ef5a4732a8d654567428b6": { - "balance": "0x10000000000000000" - }, - "0x1faf365d45e515f1918b1d2a0908325ebb514d98": { - "balance": "0x10000000000000000" - }, - "0xb408020a6d0ab002e2878566eacc3c134c57cc7e": { - "balance": "0x10000000000000000" - }, - "0x2bd7d5c0a5a18fa9faeaf1528b1862288d352dc8": { - "balance": "0x10000000000000000" - }, - "0x60e20f80e857f73362609423f5d830e8c2ef99a6": { - "balance": "0x10000000000000000" - }, - "0x87f54d73580fd6475984f116cb555b04ae8a31bc": { - "balance": "0x10000000000000000" - }, - "0xdb383969ef4dc1b0d40287675e1c2e91d94be9ab": { - "balance": "0x10000000000000000" - }, - "0x7610774aa590856e566ee4193897be0a2019ec8c": { - "balance": "0x10000000000000000" - }, - "0x7be217fd1a625a2a6bacdf612066e7f77eec4f36": { - "balance": "0x10000000000000000" - }, - "0x0240096ffcec7372ff51fc77672a830c67e3d29c": { - "balance": "0x10000000000000000" - }, - "0x96793a36a249c12db76542da6557153a168f01a3": { - "balance": "0x10000000000000000" - }, - "0x41a8414ba7ef274cd823742249dabf483e24357e": { - "balance": "0x10000000000000000" - }, - "0x5836f86339a6a88a5532fcc397e6262056f33b75": { - "balance": "0x10000000000000000" - }, - "0x6e6751d50410b777b541a8bb0f8189fb97ea90ce": { - "balance": "0x10000000000000000" - }, - "0xf0dcf392885f5f474ec3d65221caf1740a71fd23": { - "balance": "0x10000000000000000" - }, - "0x8a4e33bc8534e5d8285b25971858cb120547dc9b": { - "balance": "0x10000000000000000" - }, - "0xefdd95a951928fb0f872b6ccc6f633a6c266699f": { - "balance": "0x10000000000000000" - }, - "0x4dee03d3345805b60597230f83c4e96b9d01a124": { - "balance": "0x10000000000000000" - }, - "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { - "balance": "0x10000000000000000" - }, - "0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e": { - "balance": "0x10000000000000000" - }, - "0xA78deb2Fa79463945C247991075E2a0e98Ba7A09": { - "balance": "0x10000000000000000" - }, - "0x02354A1F160A3fd7ac8b02ee91F04104440B28E7": { - "balance": "0x10000000000000000" - }, - "0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B": { - "balance": "0x10000000000000000" - }, - "0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071": { - "balance": "0x10000000000000000" - }, - "0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC": { - "balance": "0x10000000000000000" - }, - "0x529043886F21D9bc1AE0feDb751e34265a246e47": { - "balance": "0x10000000000000000" - }, - "0xe08A1dAe983BC701D05E492DB80e0144f8f4b909": { - "balance": "0x10000000000000000" - }, - "0xbcE5A3468386C64507D30136685A99cFD5603135": { - "balance": "0x10000000000000000" - }, - "0xee59A16d95042e1B252d4598e2e503837a52eCb1": { - "balance": "0x10000000000000000" - }, - "0x320608cEB9B40fC5a77596CCad2E0B35659fbb2C": { - "balance": "0x10000000000000000" - }, - "0x675003EF9a381Edb5bA2A954eD4b15037C602A2d": { - "balance": "0x10000000000000000" - }, - "0x18041C71fCD4c913ca8FEcc56baFe26067542444": { - "balance": "0x10000000000000000" - }, - "0xC13434Bddf1Afb7Efa9d3A830778475A12A9e57c": { - "balance": "0x10000000000000000" - }, - "0x4f81423DC72Ea9AE39E539E4e5E9e7e8bAA9Da56": { - "balance": "0x10000000000000000" - }, - "0x8731D4E6b5988ddF5a224F84fF22B79059612E3d": { - "balance": "0x10000000000000000" - }, - "0x1cF006B1D8802eC6806ECAb9b34724f1269736c2": { - "balance": "0x10000000000000000" - }, - "0xB86d5bA61C85CBEd834f6f5723845e628a1c9EB0": { - "balance": "0x10000000000000000" - }, - "0x0c076c170D6eD68877DD601895FBFC94CA6e78Bd": { - "balance": "0x10000000000000000" - }, - "0xaaE4d29fe99Fc3119eff833dEc720872aEE74d87": { - "balance": "0x10000000000000000" - }, - "0xb7A8176C2E7E207c3980cc995C559741394AF7d8": { - "balance": "0x10000000000000000" - }, - "0x9652ca52DA8F96ef7117C547f4dd7304a1C4aa94": { - "balance": "0x10000000000000000" - }, - "0x2387eF704DfD3eafcb8e6A8DbD21Dff160a45c88": { - "balance": "0x10000000000000000" - }, - "0xd155b11bd4d0b17B00e4BAc5AB68B658dcE90897": { - "balance": "0x10000000000000000" - }, - "0x4886b99D33527E050180ce7f7C4000532Ba181A0": { - "balance": "0x10000000000000000" - }, - "0x9F6c3bCB57a55E2Ba5aBF19E76fED9EDbFe77E88": { - "balance": "0x10000000000000000" - }, - "0xa7eA9faf9C7e8aAc8631Fc68B53F4364C764E571": { - "balance": "0x10000000000000000" - }, - "0x5D264E40cD85D674A6eABd1AAE0Ce04D545D841B": { - "balance": "0x10000000000000000" - }, - "0x436992c636624877344c6C28702cF775d6888d72": { - "balance": "0x10000000000000000" - }, - "0x71a3E35927B5cC315147Db7d92f668e40a4eF3cA": { - "balance": "0x10000000000000000" - }, - "0x1253600fEE098C0c6c529ab874E0DD68A0322996": { - "balance": "0x10000000000000000" - }, - "0x8E711ab08631611ab620F2516E09F47a954ba1a7": { - "balance": "0x10000000000000000" - }, - "0xDD5b06793ef2E1e182b9014d0973A2B59B10D984": { - "balance": "0x10000000000000000" - }, - "0x12132bA9133C852f5491B3eE4C6DF76f355355AE": { - "balance": "0x10000000000000000" - }, - "0x97856aA63a8f7B67ae3f1d83b1AD2282812F4eA3": { - "balance": "0x10000000000000000" - }, - "0x337fE32370726c901d4E01659810791439e79397": { - "balance": "0x10000000000000000" - }, - "0x191304B8C582dBA2Dcce8C844b32ad336E8E96c9": { - "balance": "0x10000000000000000" - }, - "0xCB8e3496f8018353967540F67D8Bf35FDf3e48dc": { - "balance": "0x10000000000000000" - }, - "0x34244e31a5a4F08D519573C76a75394D3a4b67e1": { - "balance": "0x10000000000000000" - }, - "0x41309C3Ad40e308797239733C5C6A0d2Eafef172": { - "balance": "0x10000000000000000" - }, - "0xA80C88562Ba52Fe646CF6859c01F5e5AD7388FDc": { - "balance": "0x10000000000000000" - }, - "0xA3f0dcCA6f4237dB734A296937F31a3497d75d1A": { - "balance": "0x10000000000000000" - }, - "0xd16cF72FA43d16c9e3F387dbE4ce0d21D02C2941": { - "balance": "0x10000000000000000" - }, - "0x175eCd343Cb503c6aDfDBf06A5d9Df0B95BED19D": { - "balance": "0x10000000000000000" - }, - "0x88C0A9aD613d602e91baB741380bd41D3fcDbeAd": { - "balance": "0x10000000000000000" - }, - "0x914CDD22799d0cc429a441AFf89Bf60C1EeF9Fc7": { - "balance": "0x10000000000000000" - }, - "0xCa9E26AF7E7c42651776B1C3efC3Fa081e988A68": { - "balance": "0x10000000000000000" - }, - "0x629Fb91fA2c5b5f2282De6d0b50450b69B5bC669": { - "balance": "0x10000000000000000" - }, - "0x4124B8f202D7E38E9f64934255d4225aD6e61BD2": { - "balance": "0x10000000000000000" - }, - "0x2274077952c0747DaF4F13294965498eE17248e1": { - "balance": "0x10000000000000000" - }, - "0x946D8117fca630F5c5714414D65070d23a152859": { - "balance": "0x10000000000000000" - }, - "0xcd8967D374e74BFd50331CD3B1a0883930EFe1CF": { - "balance": "0x10000000000000000" - }, - "0xFC99298F814C903C3e74844b28608681De7e3D8c": { - "balance": "0x10000000000000000" - }, - "0x3e778DB39bde4BFd0aBFE7Cc5AF6EA2890a7Ba3E": { - "balance": "0x10000000000000000" - }, - "0x84c335ec543cb8CB7a2174D03E35b6d4982f06bb": { - "balance": "0x10000000000000000" - }, - "0x244eD9feDd37872115274D8073E45C0C331bDdAE": { - "balance": "0x10000000000000000" - }, - "0x6f07AA92F2b7254Ba63FAA8De4eE01bc72613c65": { - "balance": "0x10000000000000000" - }, - "0xAD9571942076bd99299b73309fd0522521C3D344": { - "balance": "0x10000000000000000" - }, - "0xdB759976b89DAAa8DA41B42e95b5CFcD6B94A0B6": { - "balance": "0x10000000000000000" - } - }, - "nodes": [ - "enode://65f9c708cd96fb4c1cfb80451ca8c304ca99660b92445b1da6323c5965332f37d4cf2c17d68ee9b413de6ce87c47c1e0a66e8d05ebe634e7ba559c67d0ec8853@172.15.0.12:30303", - "enode://030ba626855043909feec09dfa03b9b186512156ea1dc6225801f014ba49b6b8ca1579287043da69645b8fb40a8685a05bcf35949b7363749bad89611eeebeea@172.15.0.13:30303", - "enode://9495e2c34639ae6a8dbabfe7cb038d17be5e65879736b1fb56d0bfeaa01aa25f3802f45e774aae5ef7887bced5ed87a6490da75a1d894f6c7b09e6d6de62970d@172.15.0.18:30303" - ] -} diff --git a/networks/secret-store/config/config.toml.save b/networks/secret-store/config/config.toml.save deleted file mode 100644 index a701a0b..0000000 --- a/networks/secret-store/config/config.toml.save +++ /dev/null @@ -1,54 +0,0 @@ -[parity] -chain = "/etc/parity/secretstore/chain.json" -base_path = "/parity_data" - -[ui] -disable = true - -[rpc] -disable = false -port = 8545 -interface = "all" -cors = ["all"] -apis = ["web3", "eth", "pubsub", "net", "parity", "parity_pubsub", "traces", "rpc", "shh", "shh_pubsub"] -hosts = ["all"] - -[ipc] -disable = true - -[websockets] -disable = true - -#[mining] -#engine_signer = "0xa1345ed0b2d1e193aead673e33dac56515af128a" -#reseal_on_txs = "none" -#usd_per_tx = "0" - -[network] -port = 30303 -discovery = true - -[ipfs] -enable = false - -[snapshots] -disable_periodic = true - -[secretstore] -self_secret = "a1345ed0b2d1e193aead673e33dac56515af128a" -disable = false -disable_http = false # This node will expose a Secret Store HTTP API -http_interface = "all" # The HTTP API is available locally only -http_port = 12001 # The Secret Store HTTP API is available at this port -acl_contract = "none" -server_set_contract = "none" -nodes = [ - "7cb22f9a17e8880f8009b519b3506fa9d52fe0ff315f68d0dc0be9576f116818be5f3843c3e4e57aecea40bdd14c8539f5714a51d3254c2955d8a9f1ea9723dc@172.15.0.13:12000" -] -interface = "all" -port = 12000 # port used to communicated with other Secret Store nodes -path = "/parity_data/secret_store" - -[account] -password = ["/etc/parity/secretstore/password"] - diff --git a/networks/secret-store/config/password b/networks/secret-store/config/password deleted file mode 100644 index d57794b..0000000 --- a/networks/secret-store/config/password +++ /dev/null @@ -1 +0,0 @@ -8Ng6sVDLE5GW diff --git a/networks/secret-store/keys/DevelopmentChain/address_book.json b/networks/secret-store/keys/DevelopmentChain/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/secret-store/keys/DevelopmentChain/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/secret-store/keys/DevelopmentChain/dev.json b/networks/secret-store/keys/DevelopmentChain/dev.json deleted file mode 100644 index f959ff0..0000000 --- a/networks/secret-store/keys/DevelopmentChain/dev.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ebc69e4b-481f-89bb-6ea1-0df5f733f719", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "b66b7d5f80d8b44486591ab97965b03f" - }, - "ciphertext": "50adeb6abe8539140ee40009faac297ce8c70d12634b1bafd1ee44f8dee6c40c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "0570b4cea545ff4eda778e0a00c66f0357058209e497d8c5dc161a5923f4f225" - }, - "mac": "efa76188215ab904279c8efe1b8cff62a370c0ad4562a8b5fc87587b04db2748" - }, - "address": "00a329c0648769a73afac7f9381e08fb43dbea72", - "name": "Development Account", - "meta": "{\"description\":\"Never use this account outside of development chain!\",\"passwordHint\":\"Password is empty string\"}" -} \ No newline at end of file diff --git a/networks/secret-store/keys/DevelopmentChain/publisher.json b/networks/secret-store/keys/DevelopmentChain/publisher.json deleted file mode 100644 index 2226e59..0000000 --- a/networks/secret-store/keys/DevelopmentChain/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/DevelopmentChain/test_account.json b/networks/secret-store/keys/DevelopmentChain/test_account.json deleted file mode 100644 index 7409b18..0000000 --- a/networks/secret-store/keys/DevelopmentChain/test_account.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "56b27c187d45aab59377869042b948aa" - }, - "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749" - }, - "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db" - }, - "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/duero/address_book.json b/networks/secret-store/keys/duero/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/secret-store/keys/duero/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/secret-store/keys/duero/consumer.json b/networks/secret-store/keys/duero/consumer.json deleted file mode 100644 index 15d6d06..0000000 --- a/networks/secret-store/keys/duero/consumer.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "6a829fe7bc656d85f6c2e9fd21784952" - }, - "ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5" - }, - "mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986" - }, - "address": "00bd138abd70e2f00903268f3db08f2d25677c9e", - "name": "Validator0", - "meta": "{}" -} diff --git a/networks/secret-store/keys/duero/publisher.json b/networks/secret-store/keys/duero/publisher.json deleted file mode 100644 index 2226e59..0000000 --- a/networks/secret-store/keys/duero/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/duero/ss1.json b/networks/secret-store/keys/duero/ss1.json deleted file mode 100644 index f89169c..0000000 --- a/networks/secret-store/keys/duero/ss1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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/networks/secret-store/keys/duero/test_account.json b/networks/secret-store/keys/duero/test_account.json deleted file mode 100644 index 7409b18..0000000 --- a/networks/secret-store/keys/duero/test_account.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "56b27c187d45aab59377869042b948aa" - }, - "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749" - }, - "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db" - }, - "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/nile/address_book.json b/networks/secret-store/keys/nile/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/secret-store/keys/nile/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/secret-store/keys/nile/publisher.json b/networks/secret-store/keys/nile/publisher.json deleted file mode 100644 index 2226e59..0000000 --- a/networks/secret-store/keys/nile/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/nile/ss1.json b/networks/secret-store/keys/nile/ss1.json deleted file mode 100644 index f89169c..0000000 --- a/networks/secret-store/keys/nile/ss1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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/networks/secret-store/keys/nile/test_account.json b/networks/secret-store/keys/nile/test_account.json deleted file mode 100644 index 7409b18..0000000 --- a/networks/secret-store/keys/nile/test_account.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "56b27c187d45aab59377869042b948aa" - }, - "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749" - }, - "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db" - }, - "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/pacific/address_book.json b/networks/secret-store/keys/pacific/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/secret-store/keys/pacific/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/secret-store/keys/pacific/ss1.json b/networks/secret-store/keys/pacific/ss1.json deleted file mode 100644 index f89169c..0000000 --- a/networks/secret-store/keys/pacific/ss1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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/networks/secret-store/keys/spree/address_book.json b/networks/secret-store/keys/spree/address_book.json deleted file mode 100644 index 9e26dfe..0000000 --- a/networks/secret-store/keys/spree/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/secret-store/keys/spree/publisher.json b/networks/secret-store/keys/spree/publisher.json deleted file mode 100644 index 2226e59..0000000 --- a/networks/secret-store/keys/spree/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/secret-store/keys/spree/ss1.json b/networks/secret-store/keys/spree/ss1.json deleted file mode 100644 index f89169c..0000000 --- a/networks/secret-store/keys/spree/ss1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "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/networks/secret-store/keys/spree/test_account.json b/networks/secret-store/keys/spree/test_account.json deleted file mode 100644 index 7409b18..0000000 --- a/networks/secret-store/keys/spree/test_account.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "56b27c187d45aab59377869042b948aa" - }, - "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749" - }, - "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db" - }, - "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb", - "name": "", - "meta": "{}" -} diff --git a/networks/spree/authorities/validator0.json b/networks/spree/authorities/validator0.json deleted file mode 100644 index 15d6d06..0000000 --- a/networks/spree/authorities/validator0.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "6a829fe7bc656d85f6c2e9fd21784952" - }, - "ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5" - }, - "mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986" - }, - "address": "00bd138abd70e2f00903268f3db08f2d25677c9e", - "name": "Validator0", - "meta": "{}" -} diff --git a/networks/spree/authorities/validator0.pwd b/networks/spree/authorities/validator0.pwd deleted file mode 100644 index ce118da..0000000 --- a/networks/spree/authorities/validator0.pwd +++ /dev/null @@ -1 +0,0 @@ -node0 diff --git a/networks/spree/authorities/validator1.json b/networks/spree/authorities/validator1.json deleted file mode 100644 index cdf3b7a..0000000 --- a/networks/spree/authorities/validator1.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "e854acbe-e6b2-e812-9f84-7b0945a1f14f", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "1b90ae52dcc1bc285ae3846d0ca9be53" - }, - "ciphertext": "b80f21bfb2029dafc89c36c6838e7a9e711ee13ec3e6900c3b097e45ae2ece7c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "d823ab988002888a19336ab6650b83a4c536b42612148c9c5337ec4d92e981d1" - }, - "mac": "f8d1e53f4be85b0f77aa02bfe08b93eacdef74995822a59ddaea0497a69318af" - }, - "address": "00aa39d30f0d20ff03a22ccfc30b7efbfca597c2", - "name": "Validator1", - "meta": "{}" -} diff --git a/networks/spree/authorities/validator1.pwd b/networks/spree/authorities/validator1.pwd deleted file mode 100644 index f50c4f2..0000000 --- a/networks/spree/authorities/validator1.pwd +++ /dev/null @@ -1 +0,0 @@ -node1 diff --git a/networks/spree/authorities/validator2.json b/networks/spree/authorities/validator2.json deleted file mode 100644 index 31dc1c2..0000000 --- a/networks/spree/authorities/validator2.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "26ef5e07-4494-52b5-653f-a982ac907807", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "53addf73788522f6d5bf73abb0e0b8da" - }, - "ciphertext": "88c1013308cff929825e5da57ceaf15ae86e656165bcb2de3b06b24985358af6", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "ab8efcf7ee2c368eced8982b22328d862ea0c15307ce6ccd5994fae5a9b13244" - }, - "mac": "c93ca54145b4f21b62c422247609d0b891149f0d9752f6fe9ef60421f10bad6c" - }, - "address": "002e28950558fbede1a9675cb113f0bd20912019", - "name": "Validator2", - "meta": "{}" -} diff --git a/networks/spree/authorities/validator2.pwd b/networks/spree/authorities/validator2.pwd deleted file mode 100644 index 6810417..0000000 --- a/networks/spree/authorities/validator2.pwd +++ /dev/null @@ -1 +0,0 @@ -node2 diff --git a/networks/spree/config/chain.json b/networks/spree/config/chain.json deleted file mode 100644 index a75aa33..0000000 --- a/networks/spree/config/chain.json +++ /dev/null @@ -1,553 +0,0 @@ -{ - "name": "spree", - "engine": { - "authorityRound": { - "params": { - "stepDuration": "1", - "validators": { - "list": [ - "0x00bd138abd70e2f00903268f3db08f2d25677c9e", - "0x002e28950558fbede1a9675cb113f0bd20912019", - "0x00aa39d30f0d20ff03a22ccfc30b7efbfca597c2" - ] - }, - "validateScoreTransition": 1000000000, - "validateStepTransition": 1500000000, - "maximumUncleCount": 1000000000 - } - } - }, - "params": { - "gasLimitBoundDivisor": "0x0400", - "accountStartNonce": "0x0", - "maximumExtraDataSize": "0x20", - "minGasLimit": "0x1388", - "networkID": "0x2324", - "eip140Transition": "0x0", - "eip211Transition": "0x0", - "eip214Transition": "0x0", - "eip658Transition": "0x0", - "wasmActivationTransition": "0x0", - "eip145Transition": "0x0", - "eip1014Transition": "0x0", - "eip1052Transition": "0x0", - "eip1283Transition": "0x0", - "kip4Transition": "0x0", - "kip6Transition": "0x0" - }, - "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 - } - } - } - }, - "0x0000000000000000000000000000000000000005": { - "balance": "1", - "builtin": { - "name": "modexp", - "activate_at": 0, - "pricing": { - "modexp": { - "divisor": 20 - } - } - } - }, - "0x0000000000000000000000000000000000000006": { - "balance": "1", - "builtin": { - "name": "alt_bn128_add", - "activate_at": 0, - "pricing": { - "linear": { - "base": 500, - "word": 0 - } - } - } - }, - "0x0000000000000000000000000000000000000007": { - "balance": "1", - "builtin": { - "name": "alt_bn128_mul", - "activate_at": 0, - "pricing": { - "linear": { - "base": 40000, - "word": 0 - } - } - } - }, - "0x0000000000000000000000000000000000000008": { - "balance": "1", - "builtin": { - "name": "alt_bn128_pairing", - "activate_at": 0, - "pricing": { - "alt_bn128_pairing": { - "base": 100000, - "pair": 80000 - } - } - } - }, - "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xA99D43d86A0758d5632313b8fA3972B6088A21BB": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xA78deb2Fa79463945C247991075E2a0e98Ba7A09": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x02354A1F160A3fd7ac8b02ee91F04104440B28E7": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x529043886F21D9bc1AE0feDb751e34265a246e47": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xe08A1dAe983BC701D05E492DB80e0144f8f4b909": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0xbcE5A3468386C64507D30136685A99cFD5603135": { - "balance": "0x33B2E3C9FD0803CE8000000" - }, - "0x8af7d4d2ede31794b103235b9adadc85d3e190a8": { - "balance": "0x10000000000000000" - }, - "0xa406c48e08a32384abc1c22d061d3a4e22a87901": { - "balance": "0x10000000000000000" - }, - "0xc285101e2ff7388ebeaaceb7722584e8b90cb51b": { - "balance": "0x10000000000000000" - }, - "0x29d34d35098443ca6855602d45aab7eb2606c990": { - "balance": "0x10000000000000000" - }, - "0x9a72c513197f4560539046a27e1324785485e1cc": { - "balance": "0x10000000000000000" - }, - "0xa209091ae3fc83bb5cad8fff0ffa8ce0157b0183": { - "balance": "0x10000000000000000" - }, - "0x8ec02f9eeae938a9031bf57da3d9f1a1173c79ac": { - "balance": "0x10000000000000000" - }, - "0x58b0321da73f8faeffc08774d9bb961d5c875c78": { - "balance": "0x10000000000000000" - }, - "0xb40e42ded3b92f425c71ab3a727212614843d0d7": { - "balance": "0x10000000000000000" - }, - "0x14436aa3f96bf3a1628f43f7efc9e62292698a32": { - "balance": "0x10000000000000000" - }, - "0xafc8e581af80aeec3eb218373595befcf060bb93": { - "balance": "0x10000000000000000" - }, - "0xe8eca5571b304c5f4004c4793bfb7bcbba9307a8": { - "balance": "0x10000000000000000" - }, - "0x68be5a46e0d4c0b88610e6a6d52ced72975cc305": { - "balance": "0x10000000000000000" - }, - "0x98d50e062c277da127f4d17529996e20f1bcf3e3": { - "balance": "0x10000000000000000" - }, - "0x207595bc37dbac843e904f3925258244a6cdc571": { - "balance": "0x10000000000000000" - }, - "0x5f8540e90728ee064dd0f761fc14587c2be7f77f": { - "balance": "0x10000000000000000" - }, - "0xb353b58b5ff997375a30475489246d9fcad592b0": { - "balance": "0x10000000000000000" - }, - "0x4c44474a9d85431bf1b3f4e7de4598f9aa07e074": { - "balance": "0x10000000000000000" - }, - "0x76da1b5f8ac66528a7f5a0745f8557987309ff5c": { - "balance": "0x10000000000000000" - }, - "0x983108aa053a22b73f61354b708d3a8be6a66b04": { - "balance": "0x10000000000000000" - }, - "0x237e71abb676cfbdff74a09d058310ef8ba94c92": { - "balance": "0x10000000000000000" - }, - "0xf5327433c8bb9c374477efd30fd4f993cb6d4749": { - "balance": "0x10000000000000000" - }, - "0xca0b9b8b30f759c3c6ab62531fab1f14b67d9022": { - "balance": "0x10000000000000000" - }, - "0x5a4e71e6809e6903353b562fdd0d3a80fa36f6c3": { - "balance": "0x10000000000000000" - }, - "0x0e69f59bfecb92f5622e2e39793acd2bd85c6987": { - "balance": "0x10000000000000000" - }, - "0x5667d26d1e73bacbeab8a8a7bee1ace4b9818f31": { - "balance": "0x10000000000000000" - }, - "0x8ad77062ea7af6f322bfc0b3bd969bbf1d072015": { - "balance": "0x10000000000000000" - }, - "0x2760e6fabff121101747121228d73506c5e05b71": { - "balance": "0x10000000000000000" - }, - "0xa74a0ff8dff5420319c76e9e1f8eec9fea550d33": { - "balance": "0x10000000000000000" - }, - "0x437270c005837c1e585f9dd8e6a04ceefe2f0ee8": { - "balance": "0x10000000000000000" - }, - "0x3b18ebbaabd7fa7cf97c7b9cbc3ec3717de9a86d": { - "balance": "0x10000000000000000" - }, - "0x68a03dcc60d113ecd334474236606f03c1da316a": { - "balance": "0x10000000000000000" - }, - "0xffbb1177d9ebc94ecaec6adc7c5d824afb22a4a8": { - "balance": "0x10000000000000000" - }, - "0x51ee02ef590b0479387343429b7d19b8aba0cd18": { - "balance": "0x10000000000000000" - }, - "0x5ca985715a657e89ee7f8d06d98b419224a5a523": { - "balance": "0x10000000000000000" - }, - "0x45fde4de4b1ab2240f52790ab7afadcb6fc256af": { - "balance": "0x10000000000000000" - }, - "0x04f86c8ce00fe2534fa47eecc4737f3c1c7cc5f6": { - "balance": "0x10000000000000000" - }, - "0x168b2ac464bf73739843fd8cd71f7471224464dc": { - "balance": "0x10000000000000000" - }, - "0x835b5e6f655fe0fdee77ec4f944093a81ff3a649": { - "balance": "0x10000000000000000" - }, - "0xb80ca71cdc15342209e1bd90b5e30f5c26b2cd3d": { - "balance": "0x10000000000000000" - }, - "0x0d0d6e34cfc9445630b21c5e78c097d29ac59787": { - "balance": "0x10000000000000000" - }, - "0xb7a12710bb510ce851b6ba1e65185e4473ffc587": { - "balance": "0x10000000000000000" - }, - "0x94e7a08bbaea3453b7ef5a4732a8d654567428b6": { - "balance": "0x10000000000000000" - }, - "0x1faf365d45e515f1918b1d2a0908325ebb514d98": { - "balance": "0x10000000000000000" - }, - "0xb408020a6d0ab002e2878566eacc3c134c57cc7e": { - "balance": "0x10000000000000000" - }, - "0x2bd7d5c0a5a18fa9faeaf1528b1862288d352dc8": { - "balance": "0x10000000000000000" - }, - "0x60e20f80e857f73362609423f5d830e8c2ef99a6": { - "balance": "0x10000000000000000" - }, - "0x87f54d73580fd6475984f116cb555b04ae8a31bc": { - "balance": "0x10000000000000000" - }, - "0xdb383969ef4dc1b0d40287675e1c2e91d94be9ab": { - "balance": "0x10000000000000000" - }, - "0x7610774aa590856e566ee4193897be0a2019ec8c": { - "balance": "0x10000000000000000" - }, - "0x7be217fd1a625a2a6bacdf612066e7f77eec4f36": { - "balance": "0x10000000000000000" - }, - "0x0240096ffcec7372ff51fc77672a830c67e3d29c": { - "balance": "0x10000000000000000" - }, - "0x96793a36a249c12db76542da6557153a168f01a3": { - "balance": "0x10000000000000000" - }, - "0x41a8414ba7ef274cd823742249dabf483e24357e": { - "balance": "0x10000000000000000" - }, - "0x5836f86339a6a88a5532fcc397e6262056f33b75": { - "balance": "0x10000000000000000" - }, - "0x6e6751d50410b777b541a8bb0f8189fb97ea90ce": { - "balance": "0x10000000000000000" - }, - "0xf0dcf392885f5f474ec3d65221caf1740a71fd23": { - "balance": "0x10000000000000000" - }, - "0x8a4e33bc8534e5d8285b25971858cb120547dc9b": { - "balance": "0x10000000000000000" - }, - "0xefdd95a951928fb0f872b6ccc6f633a6c266699f": { - "balance": "0x10000000000000000" - }, - "0x4dee03d3345805b60597230f83c4e96b9d01a124": { - "balance": "0x10000000000000000" - }, - "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { - "balance": "0x10000000000000000" - }, - "0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e": { - "balance": "0x10000000000000000" - }, - "0xA78deb2Fa79463945C247991075E2a0e98Ba7A09": { - "balance": "0x10000000000000000" - }, - "0x02354A1F160A3fd7ac8b02ee91F04104440B28E7": { - "balance": "0x10000000000000000" - }, - "0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B": { - "balance": "0x10000000000000000" - }, - "0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071": { - "balance": "0x10000000000000000" - }, - "0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC": { - "balance": "0x10000000000000000" - }, - "0x529043886F21D9bc1AE0feDb751e34265a246e47": { - "balance": "0x10000000000000000" - }, - "0xe08A1dAe983BC701D05E492DB80e0144f8f4b909": { - "balance": "0x10000000000000000" - }, - "0xbcE5A3468386C64507D30136685A99cFD5603135": { - "balance": "0x10000000000000000" - }, - "0xee59A16d95042e1B252d4598e2e503837a52eCb1": { - "balance": "0x10000000000000000" - }, - "0x320608cEB9B40fC5a77596CCad2E0B35659fbb2C": { - "balance": "0x10000000000000000" - }, - "0x675003EF9a381Edb5bA2A954eD4b15037C602A2d": { - "balance": "0x10000000000000000" - }, - "0x18041C71fCD4c913ca8FEcc56baFe26067542444": { - "balance": "0x10000000000000000" - }, - "0xC13434Bddf1Afb7Efa9d3A830778475A12A9e57c": { - "balance": "0x10000000000000000" - }, - "0x4f81423DC72Ea9AE39E539E4e5E9e7e8bAA9Da56": { - "balance": "0x10000000000000000" - }, - "0x8731D4E6b5988ddF5a224F84fF22B79059612E3d": { - "balance": "0x10000000000000000" - }, - "0x1cF006B1D8802eC6806ECAb9b34724f1269736c2": { - "balance": "0x10000000000000000" - }, - "0xB86d5bA61C85CBEd834f6f5723845e628a1c9EB0": { - "balance": "0x10000000000000000" - }, - "0x0c076c170D6eD68877DD601895FBFC94CA6e78Bd": { - "balance": "0x10000000000000000" - }, - "0xaaE4d29fe99Fc3119eff833dEc720872aEE74d87": { - "balance": "0x10000000000000000" - }, - "0xb7A8176C2E7E207c3980cc995C559741394AF7d8": { - "balance": "0x10000000000000000" - }, - "0x9652ca52DA8F96ef7117C547f4dd7304a1C4aa94": { - "balance": "0x10000000000000000" - }, - "0x2387eF704DfD3eafcb8e6A8DbD21Dff160a45c88": { - "balance": "0x10000000000000000" - }, - "0xd155b11bd4d0b17B00e4BAc5AB68B658dcE90897": { - "balance": "0x10000000000000000" - }, - "0x4886b99D33527E050180ce7f7C4000532Ba181A0": { - "balance": "0x10000000000000000" - }, - "0x9F6c3bCB57a55E2Ba5aBF19E76fED9EDbFe77E88": { - "balance": "0x10000000000000000" - }, - "0xa7eA9faf9C7e8aAc8631Fc68B53F4364C764E571": { - "balance": "0x10000000000000000" - }, - "0x5D264E40cD85D674A6eABd1AAE0Ce04D545D841B": { - "balance": "0x10000000000000000" - }, - "0x436992c636624877344c6C28702cF775d6888d72": { - "balance": "0x10000000000000000" - }, - "0x71a3E35927B5cC315147Db7d92f668e40a4eF3cA": { - "balance": "0x10000000000000000" - }, - "0x1253600fEE098C0c6c529ab874E0DD68A0322996": { - "balance": "0x10000000000000000" - }, - "0x8E711ab08631611ab620F2516E09F47a954ba1a7": { - "balance": "0x10000000000000000" - }, - "0xDD5b06793ef2E1e182b9014d0973A2B59B10D984": { - "balance": "0x10000000000000000" - }, - "0x12132bA9133C852f5491B3eE4C6DF76f355355AE": { - "balance": "0x10000000000000000" - }, - "0x97856aA63a8f7B67ae3f1d83b1AD2282812F4eA3": { - "balance": "0x10000000000000000" - }, - "0x337fE32370726c901d4E01659810791439e79397": { - "balance": "0x10000000000000000" - }, - "0x191304B8C582dBA2Dcce8C844b32ad336E8E96c9": { - "balance": "0x10000000000000000" - }, - "0xCB8e3496f8018353967540F67D8Bf35FDf3e48dc": { - "balance": "0x10000000000000000" - }, - "0x34244e31a5a4F08D519573C76a75394D3a4b67e1": { - "balance": "0x10000000000000000" - }, - "0x41309C3Ad40e308797239733C5C6A0d2Eafef172": { - "balance": "0x10000000000000000" - }, - "0xA80C88562Ba52Fe646CF6859c01F5e5AD7388FDc": { - "balance": "0x10000000000000000" - }, - "0xA3f0dcCA6f4237dB734A296937F31a3497d75d1A": { - "balance": "0x10000000000000000" - }, - "0xd16cF72FA43d16c9e3F387dbE4ce0d21D02C2941": { - "balance": "0x10000000000000000" - }, - "0x175eCd343Cb503c6aDfDBf06A5d9Df0B95BED19D": { - "balance": "0x10000000000000000" - }, - "0x88C0A9aD613d602e91baB741380bd41D3fcDbeAd": { - "balance": "0x10000000000000000" - }, - "0x914CDD22799d0cc429a441AFf89Bf60C1EeF9Fc7": { - "balance": "0x10000000000000000" - }, - "0xCa9E26AF7E7c42651776B1C3efC3Fa081e988A68": { - "balance": "0x10000000000000000" - }, - "0x629Fb91fA2c5b5f2282De6d0b50450b69B5bC669": { - "balance": "0x10000000000000000" - }, - "0x4124B8f202D7E38E9f64934255d4225aD6e61BD2": { - "balance": "0x10000000000000000" - }, - "0x2274077952c0747DaF4F13294965498eE17248e1": { - "balance": "0x10000000000000000" - }, - "0x946D8117fca630F5c5714414D65070d23a152859": { - "balance": "0x10000000000000000" - }, - "0xcd8967D374e74BFd50331CD3B1a0883930EFe1CF": { - "balance": "0x10000000000000000" - }, - "0xFC99298F814C903C3e74844b28608681De7e3D8c": { - "balance": "0x10000000000000000" - }, - "0x3e778DB39bde4BFd0aBFE7Cc5AF6EA2890a7Ba3E": { - "balance": "0x10000000000000000" - }, - "0x84c335ec543cb8CB7a2174D03E35b6d4982f06bb": { - "balance": "0x10000000000000000" - }, - "0x244eD9feDd37872115274D8073E45C0C331bDdAE": { - "balance": "0x10000000000000000" - }, - "0x6f07AA92F2b7254Ba63FAA8De4eE01bc72613c65": { - "balance": "0x10000000000000000" - }, - "0xAD9571942076bd99299b73309fd0522521C3D344": { - "balance": "0x10000000000000000" - }, - "0xdB759976b89DAAa8DA41B42e95b5CFcD6B94A0B6": { - "balance": "0x10000000000000000" - } - }, - "nodes": [ - "enode://65f9c708cd96fb4c1cfb80451ca8c304ca99660b92445b1da6323c5965332f37d4cf2c17d68ee9b413de6ce87c47c1e0a66e8d05ebe634e7ba559c67d0ec8853@172.15.0.12:30303", - "enode://030ba626855043909feec09dfa03b9b186512156ea1dc6225801f014ba49b6b8ca1579287043da69645b8fb40a8685a05bcf35949b7363749bad89611eeebeea@172.15.0.13:30303", - "enode://9495e2c34639ae6a8dbabfe7cb038d17be5e65879736b1fb56d0bfeaa01aa25f3802f45e774aae5ef7887bced5ed87a6490da75a1d894f6c7b09e6d6de62970d@172.15.0.18:30303" - ] -} diff --git a/networks/spree/config/config.toml b/networks/spree/config/config.toml deleted file mode 100644 index aae9ba6..0000000 --- a/networks/spree/config/config.toml +++ /dev/null @@ -1,26 +0,0 @@ -[parity] -chain = "/home/parity/config/chain.json" - -[rpc] -interface = "0.0.0.0" -cors = ["all"] -hosts = ["all"] -apis = ["web3", "eth", "net", "parity", "traces", "rpc", "personal", "parity_accounts", "signer", "parity_set"] - -[account] -password = ["/home/parity/validator.pwd"] - -[mining] -engine_signer = "0x00bd138abd70e2f00903268f3db08f2d25677c9e" -reseal_on_txs = "none" -force_sealing = true -reseal_min_period = 500 - -[network] -port = 30303 -discovery = true -bootnodes = [ - "enode://65f9c708cd96fb4c1cfb80451ca8c304ca99660b92445b1da6323c5965332f37d4cf2c17d68ee9b413de6ce87c47c1e0a66e8d05ebe634e7ba559c67d0ec8853@172.15.0.12:30303", - "enode://030ba626855043909feec09dfa03b9b186512156ea1dc6225801f014ba49b6b8ca1579287043da69645b8fb40a8685a05bcf35949b7363749bad89611eeebeea@172.15.0.13:30303", - "enode://9495e2c34639ae6a8dbabfe7cb038d17be5e65879736b1fb56d0bfeaa01aa25f3802f45e774aae5ef7887bced5ed87a6490da75a1d894f6c7b09e6d6de62970d@172.15.0.18:30303" -] \ No newline at end of file diff --git a/networks/spree/keys/address_book.json b/networks/spree/keys/address_book.json deleted file mode 100755 index 9e26dfe..0000000 --- a/networks/spree/keys/address_book.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/networks/spree/keys/publisher.json b/networks/spree/keys/publisher.json deleted file mode 100755 index 2226e59..0000000 --- a/networks/spree/keys/publisher.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "a874e6fe50a5bb088826c45560dc1b7e" - }, - "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c" - }, - "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44" - }, - "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0", - "name": "", - "meta": "{}" -} diff --git a/networks/spree/keys/test_account.json b/networks/spree/keys/test_account.json deleted file mode 100755 index 7409b18..0000000 --- a/networks/spree/keys/test_account.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "56b27c187d45aab59377869042b948aa" - }, - "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749" - }, - "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db" - }, - "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb", - "name": "", - "meta": "{}" -} diff --git a/networks/spree/keys/test_account01.json b/networks/spree/keys/test_account01.json deleted file mode 100755 index 76ca09f..0000000 --- a/networks/spree/keys/test_account01.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"141de9fb-2e7a-e3fa-9d0e-ab6ac2285c62","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"7044c86e278f3b2999ada68ac1ca9fc9"},"ciphertext":"014e65a15413dd023c1528daaa372899ea871e15bce95c67cd676c4b5319ba91","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"16b8b559b259359d6e4410d3ff919ba5169125cc374dd98acceee824faa28394"},"mac":"759049737ec68f4e3d2d082e2860a2526840096ff24750b32a58dda29d77e240"},"address":"8af7d4d2ede31794b103235b9adadc85d3e190a8","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account02.json b/networks/spree/keys/test_account02.json deleted file mode 100755 index 0bd51e2..0000000 --- a/networks/spree/keys/test_account02.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"20dfa4b9-7288-4591-50d6-f9adf47f1e1e","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"48bd32b1d44b1916a18785061f4052c1"},"ciphertext":"45ae52f15b61d6fa9b8e079631f7be6b7674f0fce23abfa0ccb7ac668f733d42","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"29ce63eeb4c7f27e169b2c69ff34a85c3f7ccea54a05523107dd6b4d6b4d60e4"},"mac":"81fdf8a0a4b1a867380eb94e225d543516a7403ba03573747f5fe313bb1d5332"},"address":"a406c48e08a32384abc1c22d061d3a4e22a87901","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account03.json b/networks/spree/keys/test_account03.json deleted file mode 100755 index 0c0796f..0000000 --- a/networks/spree/keys/test_account03.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"211d6c33-a548-12f7-8516-c7053714a767","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"2a5515c6965d4c702ca28b9596a32454"},"ciphertext":"6e5bb1c9ec3d7ae3f7b39dc65809e50c2d5f87a5aac1d4157b63ba80ff12c732","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"84c4c770a8dbadb2c69bbdb9eb8b4b60c48478a96f63ddcc77cde12a007f1fee"},"mac":"0f029d930c5aef9d5f67fcf8157d0ff1832c8b75fa88679819e9d94782612b79"},"address":"c285101e2ff7388ebeaaceb7722584e8b90cb51b","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account04.json b/networks/spree/keys/test_account04.json deleted file mode 100755 index ce20fbe..0000000 --- a/networks/spree/keys/test_account04.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"22307977-1a7b-6012-83c5-188a9a4d4d0e","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"e4811f6fd4d2158d3d51fb768bfe4355"},"ciphertext":"e441da18659110b15b3fcf8aa8c673d767364fe719e6a8c4ade89631fec4cbcc","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"55029f16325d5e1a292e68af27df80b7d63c15361446478eac312de14b785c09"},"mac":"bb9175113956156f73eebabf81c4e4ae45197988a3ecff89cc171425c2de1586"},"address":"29d34d35098443ca6855602d45aab7eb2606c990","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account05.json b/networks/spree/keys/test_account05.json deleted file mode 100755 index 813e88e..0000000 --- a/networks/spree/keys/test_account05.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"50eeab49-e1b5-b4d8-d506-5ea9b3b3a0a4","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"f9c30634df078c05776f905aba400ded"},"ciphertext":"3a73018c396c0a79d13bc531b6f0c6066ddfcd274d7ce56f0b3d7ab82612c16e","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d95191ba73cfb9706f9991ff3f8265093ccc5fb689fb87705be1e8f69873b31c"},"mac":"d8b1e3774f9f55562c850958436040c0bdd6d32f89ab4d30c70dde2eaacfbd90"},"address":"9a72c513197f4560539046a27e1324785485e1cc","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account06.json b/networks/spree/keys/test_account06.json deleted file mode 100755 index 5ea4d31..0000000 --- a/networks/spree/keys/test_account06.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"61d5d113-8ced-36a6-2b81-e6ba3f208ce1","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d556e388546b0bba0fa8c1da2d8899fa"},"ciphertext":"539324875c2276e21968fd5aab23a7e721428f5c1d4701b601fdd5d0c3f09ccb","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"54116ea655aedb1aa13b1fed8bdf41cec4378e1be09a0c8ae1633bc7e5739310"},"mac":"49a0f4a06c368d3016472d6497c2db8b9740dfba657ec011dce60020ad98606d"},"address":"a209091ae3fc83bb5cad8fff0ffa8ce0157b0183","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account07.json b/networks/spree/keys/test_account07.json deleted file mode 100755 index d6db399..0000000 --- a/networks/spree/keys/test_account07.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"6adcfd0a-5bd3-986d-f77c-abdf57069353","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"0182f7e3f3b866a941a489344b659cf1"},"ciphertext":"30be646a8456c6b4ce416feccaa96033e116f3b51d1abbdf68e80259fc5e8cb2","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"41e79e1134db26a5edc44a02a913b7ae84925d1d0fbf4ed79cf391e083daaa4e"},"mac":"ecaa154ef6a930f0a1b72484dca35506b3b3adc5e3a2a815d95169d058f9b842"},"address":"8ec02f9eeae938a9031bf57da3d9f1a1173c79ac","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account08.json b/networks/spree/keys/test_account08.json deleted file mode 100755 index 00767f6..0000000 --- a/networks/spree/keys/test_account08.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"a90609b9-0bfb-1df8-d21a-a3aa06a788e9","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"9f4c785851a8db0330c25555261c1cd2"},"ciphertext":"f6231abb97c70697798b87db862ed7545ed962cc15d0bdebe1fd6592d40e8891","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"636047c49ba5befa5e56da4eab6c0069ce25e8c6d8ff95f85222a1a01715a7d9"},"mac":"b75256921b56d563317e017c12759d7ac494649977771d56ca991a5458a2bd58"},"address":"58b0321da73f8faeffc08774d9bb961d5c875c78","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account09.json b/networks/spree/keys/test_account09.json deleted file mode 100755 index d990ff2..0000000 --- a/networks/spree/keys/test_account09.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"d8dc7265-71ae-a81c-2f6d-0227d23281cb","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"9495877211b0b61143ad227af821e182"},"ciphertext":"8ec8b70c8be68d776dac2a282d16dd586aa6195bc6b188fba088762d8a29a27a","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"16dc5d6e586a11541f07ffcaa76799ffcbc9c0a72b8de92b85192eb5eee5b827"},"mac":"2c6ba5c0f2f0a85b07d9e1717379cac7f93cee39440a4fa2ffa1518f625dcb2b"},"address":"b40e42ded3b92f425c71ab3a727212614843d0d7","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account10.json b/networks/spree/keys/test_account10.json deleted file mode 100755 index 4ce3da1..0000000 --- a/networks/spree/keys/test_account10.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"0ebb2932-6a27-1ff1-5294-5a12eaf9a7a5","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"54d8b2b01addf42cb3301549d4593e40"},"ciphertext":"fc4aab3af575e85faa6e84c3286ea75d521aa7cc5e7729e3bb948f3bd646f612","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"a635214678106989e79bf41f88c00c05c545c569f936f56c1f0e5f8a1d42bfdd"},"mac":"f1b976075c93c04b7a9c12f00fae551ff11ac27867f2e4c17c7c058974b426d7"},"address":"14436aa3f96bf3a1628f43f7efc9e62292698a32","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account11.json b/networks/spree/keys/test_account11.json deleted file mode 100755 index 2570903..0000000 --- a/networks/spree/keys/test_account11.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"352a4da2-f4c9-825d-e366-a5d9632b9d14","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d69affce6050b99a1f7abf6b6ce22bd4"},"ciphertext":"a9d435f6065b3667f18333ec5fcd3d8a740455f727bd02ea7c76395451e28d7d","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"228de18523023f1ad61ea892933b65572d7d901f5a118e3c4bcfbb176c48972f"},"mac":"cdf99745d3fbbdeadfb0113344261d1d74b0ca50683f4298fff5b418e60eeb5b"},"address":"afc8e581af80aeec3eb218373595befcf060bb93","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account12.json b/networks/spree/keys/test_account12.json deleted file mode 100755 index 5b8889c..0000000 --- a/networks/spree/keys/test_account12.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"609d7c73-36fb-edab-61ce-47745f517b41","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d8d9012bca569b0d082b2eb04915f0e6"},"ciphertext":"454b1e90b9680aebdfaaa473dea9b7a6231176047ddfdce4a36a0f458661b7cc","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"c43d9d4a6e9c4407ace172efb582ed8c8ad571303a3da4dc4adaf54af4ac919c"},"mac":"02a4e17d42aa993dc6e5efe1c96b80f619b703cd85385bcaab0fd54ad501b7b4"},"address":"e8eca5571b304c5f4004c4793bfb7bcbba9307a8","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account13.json b/networks/spree/keys/test_account13.json deleted file mode 100755 index 74f46df..0000000 --- a/networks/spree/keys/test_account13.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"643b085d-3896-5b55-79dd-1173c861ac34","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d7436e51929b4a7b9021e74107121761"},"ciphertext":"27a7de9eba8b4e0539eae33191cf1a9d1bd0f77ecbfcf4577d8b92f210abd8d1","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fccbc5aa3835b8befbbe2fa5fe263f57b9c7245c77a9391e5a55ad4037b4888a"},"mac":"0a082413a45ea45c1c5fb3a5deba9d833d616e0b9ac9c36590f52068a5bf7b5b"},"address":"68be5a46e0d4c0b88610e6a6d52ced72975cc305","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account14.json b/networks/spree/keys/test_account14.json deleted file mode 100755 index 27485c0..0000000 --- a/networks/spree/keys/test_account14.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"926a727f-2a62-d11a-7d9f-2132a22ddfd0","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"7833cc3e9457c0b6749aa83ac9d4b18e"},"ciphertext":"4bc44e8a8eaddfe72220d8b2468ee841411e3ef4e1486320907861615ef0902c","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"5f87e03e321ccf225f9b53b5361b20c759621843fd6490bdf76b8028aceca995"},"mac":"d5a96b8bf1535a7218da9430e4213f0beba425fa4361fa4fd976d570f97d4149"},"address":"98d50e062c277da127f4d17529996e20f1bcf3e3","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account15.json b/networks/spree/keys/test_account15.json deleted file mode 100755 index 074b949..0000000 --- a/networks/spree/keys/test_account15.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"a12ba12b-db8c-1422-13ee-6d8799fa7b0b","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"00b78d7c4ada02e32e8fcd748b780e2a"},"ciphertext":"d2e1cac112e587b2ca99f969a236a9953ec4983b356af361582998f59ae9f69f","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"3cfc7546adf8cf20f6de8be61213f9e84583383f9268f131bf81008d768f748c"},"mac":"c2583892a4f5a59fe4496fdac6f31d633b6f5fd0ef35a1b03b6f89031b611611"},"address":"207595bc37dbac843e904f3925258244a6cdc571","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account16.json b/networks/spree/keys/test_account16.json deleted file mode 100755 index 62f0be2..0000000 --- a/networks/spree/keys/test_account16.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"af5040d2-dc78-0f7f-a682-c84fd94cb5ce","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"667e8f543309277369678b5fa13251be"},"ciphertext":"cd8434bb940683a96f5e02329c7702e0d2fbe4735066037056a1a65f81853cc9","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"bcaa02c7a139189353c3f6cd06882a25907339b2d767c1bd7968b74e6f994259"},"mac":"684f874e97f51d91debdb65a44a87cc1deb9f2bfc868f7f14322aacf46f9410a"},"address":"5f8540e90728ee064dd0f761fc14587c2be7f77f","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account17.json b/networks/spree/keys/test_account17.json deleted file mode 100755 index 5fa95d6..0000000 --- a/networks/spree/keys/test_account17.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"bf6a759e-fa35-974a-118c-f49aa475b5db","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"592a355a1f1f5d72faae219daa98c8a9"},"ciphertext":"798619b218bddfaae7588cc30002079d4e2e36e82ee613b13df8696d7185598f","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"ad5d57dcc40c21ffbff13082243909c2ebe6d7d592c726f7b988532235808863"},"mac":"f541e642edc3bd4a5a6934d5cf3f84e8679c3cde39099f362af38f0e87167f44"},"address":"b353b58b5ff997375a30475489246d9fcad592b0","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account18.json b/networks/spree/keys/test_account18.json deleted file mode 100755 index ccf4532..0000000 --- a/networks/spree/keys/test_account18.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"e7684a67-eb1b-7583-3d12-4708079e4b7f","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"fccaf7efc16b39df7fca71dda5d0453f"},"ciphertext":"cea97384c7ba87da8a1b8ebeb55caf880f1f7b263ce4486e4b841f820a926dc5","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d571ba38fcce571ba739e6df744911c74f371f4c2186ebb972d3f8528aa80d2e"},"mac":"8a3bf983027fa8a09dd8f9119608f392163ef2dd479380c2e8f67095a1a8e002"},"address":"4c44474a9d85431bf1b3f4e7de4598f9aa07e074","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account19.json b/networks/spree/keys/test_account19.json deleted file mode 100755 index 16f85f6..0000000 --- a/networks/spree/keys/test_account19.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"fca29f7a-0252-c787-45c2-87b00e145a33","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"3c773b1e04783213223b2091c4d4ca7d"},"ciphertext":"897869a9ee303c340ede1644c51dae6f5acd7f5e059eb2dd1bc21063d42cc271","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"46aa8ada3e040486a0a7b4a605f6db906af5ce361c1d516471409c3ade91a7cb"},"mac":"51c65ba198e862914776139bdceef163df038c349e256520b66a0ef336455c74"},"address":"76da1b5f8ac66528a7f5a0745f8557987309ff5c","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account20.json b/networks/spree/keys/test_account20.json deleted file mode 100755 index 32af650..0000000 --- a/networks/spree/keys/test_account20.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"ffbfa077-710d-7b7d-db9e-b5d84814afc4","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"6b5f06733809fa29e962ba1a8f88565c"},"ciphertext":"6acad17266cf5e100bdb40ee125d4e56ec35aa56c14d714ff7dbda73cd750679","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"ea88af8e479db88b639e6da9d69579d4f6b384d4b6cba0a1af1f0b2515343f9c"},"mac":"790b7130f8611786e3f150a06330342b81f9b71d79ba95643b85f9ebf8f3eef3"},"address":"983108aa053a22b73f61354b708d3a8be6a66b04","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account21.json b/networks/spree/keys/test_account21.json deleted file mode 100755 index 0d94898..0000000 --- a/networks/spree/keys/test_account21.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"40cbef82-fd9c-0e80-4df5-cfea50739470","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26c3e19ed9926170b7d782f802c0d90a"},"ciphertext":"10dc6f2f30421131a082a9ce74bee33a8fb0c13aeb708ecf79df0c86bed73a58","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"eb68c94b7a7604c117fb8d106c723f29f54a6e7aa4e38a111b2317dcd2fc4b95"},"mac":"b9d6aa4345ecb8211799e60cc95642d429138db2e2c0e46cab25eac882d4e5d4"},"address":"237e71abb676cfbdff74a09d058310ef8ba94c92","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account22.json b/networks/spree/keys/test_account22.json deleted file mode 100755 index 2344691..0000000 --- a/networks/spree/keys/test_account22.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"4fbfc53f-d8b0-fdc4-31b3-2c766d0a7c62","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"74f136f2259e2efa8d57c4d602134c32"},"ciphertext":"01ee135dc61064fb4f4d21feb92ce925bda81892752787834f82534e7aa263b3","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d76f7472b8e82ee88da96a4bf449faa9e72edc6999f56824d9ee7adfa82bdc52"},"mac":"9860e7a86b8eefd0b83c9bfd331717b8fa0dfc5cc27d72f07f7e37fea8cfc6b1"},"address":"f5327433c8bb9c374477efd30fd4f993cb6d4749","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account23.json b/networks/spree/keys/test_account23.json deleted file mode 100755 index 5ca17d0..0000000 --- a/networks/spree/keys/test_account23.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"94e925b0-0b49-f192-59a5-172a333eec6f","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"e447c0784f2635468a89a17c0eee96e1"},"ciphertext":"01f946159dcf016fcd7a48fe4d954891a65b6e3754ae4460ab044aafdc06ea6e","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"3b1d57a08cd6ede21470e2a588ae96900adb4c0345040c4615d257b62f7f1852"},"mac":"7d920e8ec6202cac0fe18d962de174170d593c5b0b307029367d96bc4ce081b7"},"address":"ca0b9b8b30f759c3c6ab62531fab1f14b67d9022","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account24.json b/networks/spree/keys/test_account24.json deleted file mode 100755 index 485836a..0000000 --- a/networks/spree/keys/test_account24.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"9d927dae-a12d-7db2-ec52-91dd862a8419","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"cebc703823b7d89aec4ad0b072c850c6"},"ciphertext":"8b087ecf8b8dddd92b9bee034813ad37c43d904342f0ffd771d91c8e6514f4ed","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"3cc385bda80d4df43442b366143a29ab4d8585178448a38128a2dcd6772c3347"},"mac":"9dc93fcda4a00eecb33e08a5412119be052a8b9d81e33e02d9739b96610fd429"},"address":"5a4e71e6809e6903353b562fdd0d3a80fa36f6c3","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account25.json b/networks/spree/keys/test_account25.json deleted file mode 100755 index 197520e..0000000 --- a/networks/spree/keys/test_account25.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"aa7aa629-164c-858f-3fea-92756653f85b","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"0aacd865afbaa6ae69862c92792c5c2a"},"ciphertext":"b07986247e93b0e0f7f1f38f02ca687bd0fa351f18ed9927202c69a9fd77c54b","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"e41f7ecdd3b0dbc2dba181d0ae5f5e9f0007536d23ef8b5a76693ada16b6de4f"},"mac":"540f3f29b315a897cef5cd52217d4345bf5d7a5f66114bef9bfa7779ac0db206"},"address":"0e69f59bfecb92f5622e2e39793acd2bd85c6987","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account26.json b/networks/spree/keys/test_account26.json deleted file mode 100755 index d94ce9a..0000000 --- a/networks/spree/keys/test_account26.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"bd916436-bbf8-bf0a-4945-8d8502a44846","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"b079f41a01118ae7eefcc2fa83103516"},"ciphertext":"0767f5bc7a117ac2d6369c646f469c96a5a1d197b106c31c42f10f477ccc4833","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"22197b38a6531e12de7d61cfc39eea2085f7802f68762d89177411a6bdb1ccf5"},"mac":"05ba36a2a3ddc78fb7962e89d7c2f284de5f91d8f3fd2d14af19d85988f7e80d"},"address":"5667d26d1e73bacbeab8a8a7bee1ace4b9818f31","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account27.json b/networks/spree/keys/test_account27.json deleted file mode 100755 index ec1d129..0000000 --- a/networks/spree/keys/test_account27.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"c1731e22-ff6e-6f2d-a5d4-906e8b165232","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"37f7916917c08cd9dbf2e303e7981515"},"ciphertext":"9d41be37516278eb5de4b06b9b5098fe0bb6da7f477d0a78f73eb3315aa477df","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"5ffadb55532ec8d13313b42535aadc87dab1308d5c66e9a5b836a3d4fc7b1ed6"},"mac":"03d2b50e8cbaebc68ce923847772daede4a7f7845e8508ff42a1cb581b290e64"},"address":"8ad77062ea7af6f322bfc0b3bd969bbf1d072015","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account28.json b/networks/spree/keys/test_account28.json deleted file mode 100755 index c0da45a..0000000 --- a/networks/spree/keys/test_account28.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"c953a9d9-9b5a-73c2-4151-229d0bf5b54a","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d0eb59dba20e076886d4bc1b5d7d80b9"},"ciphertext":"ca467983c091be4fa6b8d042fac86a88f9edef7f00aebf35c9d27ad8e9bc13b3","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"24afc3a36b5ec7eca7c2affc3a03b57bfe8cf85856f3995d80ba95d151591cbf"},"mac":"fce5dd41c1886044e556d598d88788dd172ce78f893510207685974cdea370f4"},"address":"2760e6fabff121101747121228d73506c5e05b71","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account29.json b/networks/spree/keys/test_account29.json deleted file mode 100755 index f790a87..0000000 --- a/networks/spree/keys/test_account29.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"e27f9b26-9ca7-8354-c037-f6f284423d91","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"e8b12d8b9f28d7ed88abe065139ddf24"},"ciphertext":"135bf6e47ad744d084ec2d3ff3183834005b83b3da537ead9f3bda3e2806b869","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"57dca30bc5a7b0813ac58ce5544c67c220f78224fd94cac771c1b694bb9dc781"},"mac":"2c0a9237551523dc2688405898dbbed2faa649a47d3b6c330324231cee9b9c62"},"address":"a74a0ff8dff5420319c76e9e1f8eec9fea550d33","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account30.json b/networks/spree/keys/test_account30.json deleted file mode 100755 index 8ce182a..0000000 --- a/networks/spree/keys/test_account30.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"ffec9f8e-eb12-bf18-3b87-1f6d962bee20","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"a2728da1778d270655bb1900e2ee351e"},"ciphertext":"e98c561b015a29eb12128ed42fa66cb0544a33c41014260b58f3bd19c2762c3e","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"3298ca6f9b88b7ecfe9ea40f4ad0145f2c65cfefd67337b1d41c04eac9d763c3"},"mac":"a30f7f2d2ce7f64760a2c11ff0dc793906dde8524ed3a95197d535f9dacf9a12"},"address":"437270c005837c1e585f9dd8e6a04ceefe2f0ee8","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account31.json b/networks/spree/keys/test_account31.json deleted file mode 100755 index 8892b6d..0000000 --- a/networks/spree/keys/test_account31.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"0863367e-94d1-10ed-2a13-5c5773b8e212","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"e669267d4f8868391ee336baa08d462f"},"ciphertext":"85f063cf205ad89cf03d68ec307a0e24cbfa702cdd023ae4fbec330a56954118","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"ff1c141ad273ce3a419789fe699dba607dab2466a0ea663cb81d440c2d45c258"},"mac":"eb614ecb53c0748ae13025a85f7bd0f10443a0afb5b5463feb816a968447508c"},"address":"3b18ebbaabd7fa7cf97c7b9cbc3ec3717de9a86d","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account32.json b/networks/spree/keys/test_account32.json deleted file mode 100755 index 0d0e561..0000000 --- a/networks/spree/keys/test_account32.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"20fd0823-82f3-d018-6bb6-866740d60dae","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"9154deba11a9fcccb661ef8bc4bb865d"},"ciphertext":"6e318be9f566d53868d35848ed414998bf65ea40d87b830314e48423b755e1d6","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"6e45355a62107efe008fb7b544dbd0a29a5ca8c14fb2d1b5390a26ea358a29aa"},"mac":"f30dce5f3791fdfdd827a895522213210cf36b2b6e33417859c0c53d96184fa0"},"address":"68a03dcc60d113ecd334474236606f03c1da316a","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account33.json b/networks/spree/keys/test_account33.json deleted file mode 100755 index 5e99aff..0000000 --- a/networks/spree/keys/test_account33.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"3f246864-a9e9-0f5d-5b19-706ee8e84dc3","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"db22167f9b6729b1f287127a7ded9a32"},"ciphertext":"654c564fd3aa28e7254429fe32e3a87286e6486435faaeda261f4b0c02e49a94","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d6b0d13e0c241a8280b1b76284b8af14e6eecd46b77d5d2c5b147afe7a5f99d5"},"mac":"12a68435dd3fc90c42c852df9ed1f64a9001f01a7970554b9b76d30f2d5d22cd"},"address":"ffbb1177d9ebc94ecaec6adc7c5d824afb22a4a8","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account34.json b/networks/spree/keys/test_account34.json deleted file mode 100755 index f3993c2..0000000 --- a/networks/spree/keys/test_account34.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"7027e4fc-b04a-9941-aed6-593d5f89b189","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"ed02919877cef4a06df942524e4ff102"},"ciphertext":"23d6637a8bfb659467241a492f933a60e79a6c0d98852ecb8608f5fe4a9697fd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"bf96e700ef24d547a525426ec26fd378e58843307ac07c538065e99b0602f1c1"},"mac":"1247814b294580fc49490dd24f8b878b821a71fce3d547add3ddc06e31c05ec4"},"address":"51ee02ef590b0479387343429b7d19b8aba0cd18","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account35.json b/networks/spree/keys/test_account35.json deleted file mode 100755 index 85c909c..0000000 --- a/networks/spree/keys/test_account35.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"8f2925b6-4a1f-0350-e9a9-767b103971bc","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"3f63b224cba38d625fa84b06a78474a8"},"ciphertext":"cfe0c292ecb6b4c1cafb5b56a423b41288aec496acf4469e2255e45f9a3a6936","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"90622f0023dbce5c974275fc8c08dd9f6149a574afa07abff9f7be2272a1f4f0"},"mac":"00366e11d7f8c5ab136911a993a702f71ab47a7420b558d622ef9d3a628734a5"},"address":"5ca985715a657e89ee7f8d06d98b419224a5a523","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account36.json b/networks/spree/keys/test_account36.json deleted file mode 100755 index 3f54450..0000000 --- a/networks/spree/keys/test_account36.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"94a54a64-50e5-6c7d-12b5-ed413ac9c45e","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"ddaec0e0050a59476952331d2c1fd998"},"ciphertext":"403aa7d547b1a869684369615fcadc9c73900268aa540a0bc9412c25fa1a5734","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"26a1a17dcf9025c3347ee4b21247538b27b5860353f5cfefdcbac0f873643356"},"mac":"a1bf15462bf159f7a75f4398f034f013a7139b23d53e080158fc6406919ebd64"},"address":"45fde4de4b1ab2240f52790ab7afadcb6fc256af","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account37.json b/networks/spree/keys/test_account37.json deleted file mode 100755 index e3d0622..0000000 --- a/networks/spree/keys/test_account37.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"d5c66c33-1004-92b4-635d-6122177ad792","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"38e0b21746b6acac4bcca190325f2477"},"ciphertext":"a7f491dd59ca796881087ede866dd21a222e404a5dffb2c78cffe08dd2ef5ed7","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"a05c3f166beab5c78a1116e708b35d34a415a25920153c86624933f15e221536"},"mac":"8d4d18055b12a83373bc1be5b879010d7b3005af5d26999d83b8f140e5e5f4de"},"address":"04f86c8ce00fe2534fa47eecc4737f3c1c7cc5f6","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account38.json b/networks/spree/keys/test_account38.json deleted file mode 100755 index 5698f3c..0000000 --- a/networks/spree/keys/test_account38.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"f2b10959-5928-65aa-4a05-8318155225dc","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"667037452915c5e9d4a0f2f356334f0c"},"ciphertext":"ac54ea91520ee4a64a0c92d0ad6ff99a5aacef05f531a882b174287b9c2c7569","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"5f9b41144cda784f1ea32a2068f834ddd9dba1790316ab09b91341c1a5e8c61d"},"mac":"bca0c8d6b47c07466222fa62b264a47f0e940e39c7ab64271150825dbdd28b91"},"address":"168b2ac464bf73739843fd8cd71f7471224464dc","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account39.json b/networks/spree/keys/test_account39.json deleted file mode 100755 index e34eff3..0000000 --- a/networks/spree/keys/test_account39.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"ff95cc13-21db-1866-2f08-56d6e54c5e7f","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"546560c6b6cc915fa9121c9aae7588c6"},"ciphertext":"c42159f066bbde6e6cd10ba7d8628c28ee59228b568ea4bef80b48d8ce4480ce","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"7fbbc4cf67838912c68596df7cb5c6b70c42ad081d665b0bafbd5305265691b9"},"mac":"b91b0b279e632604055803be20a607cbea85c4e1d52bb92b9380722195930347"},"address":"835b5e6f655fe0fdee77ec4f944093a81ff3a649","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account40.json b/networks/spree/keys/test_account40.json deleted file mode 100755 index 791f409..0000000 --- a/networks/spree/keys/test_account40.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"48dc6297-37d8-13f1-2642-c9b072b2b298","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"9a974ce695f9a5e6952f11fbfce29599"},"ciphertext":"2e556a6c86f81c0ab4660cb39c232908e6ffc70c49b471dda79956d9f00ea064","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"f4044edd92f1f893bd1dfea06d982c0de53a4d66b9270e78dfed31d9f5c3d7fa"},"mac":"b9e686f3f98334b2bbc02ba1b1a8fa8f9f97a8fef7a164531bd4dabe25033e8c"},"address":"b80ca71cdc15342209e1bd90b5e30f5c26b2cd3d","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account41.json b/networks/spree/keys/test_account41.json deleted file mode 100755 index d16ceba..0000000 --- a/networks/spree/keys/test_account41.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"692d1595-6968-565a-b6d6-6a58691f33a7","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8606b2f1c95123a2ff3ed16022bd070d"},"ciphertext":"f45c36a3a3305cce3e3eb017ae0b345a7ce2543cc9729718cfc47884162ca3d8","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"c38975548f1ca2673f15ad7c093eaeda2d94ce993e86b38accb3255204ee7e62"},"mac":"cd9d0fb71d88926e33cf9616ec258a0bc25b9cdcfa4309b7ff66eabcb9dc5b92"},"address":"0d0d6e34cfc9445630b21c5e78c097d29ac59787","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account42.json b/networks/spree/keys/test_account42.json deleted file mode 100755 index 5c429c8..0000000 --- a/networks/spree/keys/test_account42.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"70bc13d7-c545-21bc-509c-95f0bec896b2","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"1fcbcf0571697e991878417d57b63d7f"},"ciphertext":"eba99d5270cbb805a2f2b43e3c4110afc7b0821cd37e94ed77b73fbf8e548bd5","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"21bd798c0ed9159b65fd435224cdad1ed624728e0eecdf114615f7360cf2218e"},"mac":"af77be465838bccdcd6c2a9ce6490c1986d476218675058a76025c0ded85263f"},"address":"b7a12710bb510ce851b6ba1e65185e4473ffc587","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account43.json b/networks/spree/keys/test_account43.json deleted file mode 100755 index e3d6657..0000000 --- a/networks/spree/keys/test_account43.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"7ebd031b-c642-b3e1-7090-766fbd0e2510","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"46fd61b6f8c6797f7f6265d5c7313d59"},"ciphertext":"7c0386ec7d080824e17c7ac278c43a5c264e3c9fe22d7a86a658a18a29dc34fb","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"f2e4e368de3762fc4cbf7edc29028cfdc1061724ed7228ffffdf398ef62d083d"},"mac":"4f1b65f450a6e80240b5dc101758b4809cf627d9f9559e5009c9248e4b78a9e3"},"address":"94e7a08bbaea3453b7ef5a4732a8d654567428b6","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account44.json b/networks/spree/keys/test_account44.json deleted file mode 100755 index 134f782..0000000 --- a/networks/spree/keys/test_account44.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"8f8ca431-5b59-1fdc-ef66-2a5a3901bf9c","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8893d8db50baceea411b6dfed97e3801"},"ciphertext":"c37193ec49f45eb4259c2d8e293985fca88dc09b0f55ab90560cfeca35671bc0","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"9271cce76a97fd5d838a345ced7a6e0738da0b8e81540c8470e6f92651069ef9"},"mac":"15789da69057a2f056d0706f4883ccd31ef6d42765270a096e87ca509aaf6e0d"},"address":"1faf365d45e515f1918b1d2a0908325ebb514d98","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account45.json b/networks/spree/keys/test_account45.json deleted file mode 100755 index 744fc37..0000000 --- a/networks/spree/keys/test_account45.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"a6003cfe-3a90-6265-7546-dc312c1ed2fa","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"2ec4c9580ce079aef790c175aa9ce37d"},"ciphertext":"57e200104821b0ca9ff97a2f2b60a473e2ff23878e10cb7554992bf694409b6b","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"c36d2282b09f368de25a7058d1baf9e96c7a72f6b640d0a96ff671ebc12fd6ce"},"mac":"299b50f850a5427303b94001a67615e3986fcbbe753355a5a6f9f6196519d900"},"address":"b408020a6d0ab002e2878566eacc3c134c57cc7e","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account46.json b/networks/spree/keys/test_account46.json deleted file mode 100755 index 2d27159..0000000 --- a/networks/spree/keys/test_account46.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"ba6c81f4-ea3e-7e70-38d0-d4c7a603fe2f","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d9161862728e2c05d5436c2b578b9009"},"ciphertext":"390abfa6eb4144e633f1c2a935b25e655e6388b3f9d184a9c072907f1bd55f62","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"a060ee8faea4d63806e7fe2f8e050377d8492b01e6f740a3797c7d4233c6862e"},"mac":"579a606eb89f8eb379bc45408cc5182022f0592bf2b8fb95865bafc67bb78322"},"address":"2bd7d5c0a5a18fa9faeaf1528b1862288d352dc8","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account47.json b/networks/spree/keys/test_account47.json deleted file mode 100755 index ce88005..0000000 --- a/networks/spree/keys/test_account47.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"ec04b012-8d6f-348a-1fee-432c72e8be2f","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"e93351b5db9a2a1449ca7861eb942be9"},"ciphertext":"65c7c615392a71727b48dce989f1e4933ad019536702299041b5a66a9b831be8","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"ec88f44469b713e5cbce93c9924518401cdf23d207c7db6b61b19c5699401d74"},"mac":"b7a72fde808481fa525311b2855138c5aa594de46b4ffe2f6498dc50cf40adf4"},"address":"60e20f80e857f73362609423f5d830e8c2ef99a6","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account48.json b/networks/spree/keys/test_account48.json deleted file mode 100755 index 129437b..0000000 --- a/networks/spree/keys/test_account48.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"f248ce28-5fdd-bd06-44b6-5cada20870b9","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"927ae98d6f266a619d7efd0d48fa6bfd"},"ciphertext":"f86e0f59ae06c01d029dc9ee20ec3a0fc5287315b62ccf8e9d411b1230937f1b","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"d8398f3eefe6eff76fd670adab1dbdefa788a43276a332c58d8549133124dccf"},"mac":"19e14c38dd815a5cc537cc3a13b02aa224aa55514f131a5f72ce5a876660efd7"},"address":"87f54d73580fd6475984f116cb555b04ae8a31bc","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account49.json b/networks/spree/keys/test_account49.json deleted file mode 100755 index e92de37..0000000 --- a/networks/spree/keys/test_account49.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"00a3b859-8da8-b027-8f36-e56858cabcec","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"702cca3cdbb58eefe03af34d8c907cbc"},"ciphertext":"b99c2492a6bf6d588c2bf01060bf8b0c161784acc7b0e916efce743bb80196ff","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"8796a8055a4f916b610a46d7f3c3c1f98e1ddfbaab991a98969054a1fce499fd"},"mac":"d54dc4146f1ae00620bfccc1780558f46b6791caa25613bbbe8192f6f6d369c3"},"address":"db383969ef4dc1b0d40287675e1c2e91d94be9ab","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account50.json b/networks/spree/keys/test_account50.json deleted file mode 100755 index 4cb912f..0000000 --- a/networks/spree/keys/test_account50.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"146436cc-00c4-0884-847d-fc5274fa27eb","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"97cbea6c732e4ea4ca7b96727614433e"},"ciphertext":"61331bf3d84a0cd1244be77ff2920a07eb61670fe08c79a873353cfc04cd1620","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"5075bb12090aafc97628db121cb8097909d532a9953b997011827c249fb8241a"},"mac":"4f1d620de55def28b9870919b30399e0628917083fdf89a7e4cd93bc1007d505"},"address":"7610774aa590856e566ee4193897be0a2019ec8c","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account51.json b/networks/spree/keys/test_account51.json deleted file mode 100755 index cff89f1..0000000 --- a/networks/spree/keys/test_account51.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"14e37597-d88d-c7c1-3703-9005b869221a","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"7d552983023e2d94404b70a10473818f"},"ciphertext":"e70b7f1d3a37df30d03944b3ec1883a9c89f43a6fc70d2b37cc7da2d84dbcf18","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"a40bc5597fe11a2fa1d7cbf99af926fa58d743087bfc322250b142c5d88184a8"},"mac":"2216a2193e532a6563a86211320db70ba76f2e799af0e4a83cd09bd8b9b0c440"},"address":"7be217fd1a625a2a6bacdf612066e7f77eec4f36","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account52.json b/networks/spree/keys/test_account52.json deleted file mode 100755 index 6b76289..0000000 --- a/networks/spree/keys/test_account52.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"21e32f3f-8ec2-ab39-e214-5d11202e6d32","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8cc4636303208ff77874bfb84907772f"},"ciphertext":"df207f47b766304283ee6502a28f082d469c95ce8aaa981d1d6e16b2a06c226f","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"6592a9a5f6089b7d313c157f3f7a7cb0eac77bf2f18cf8e33bba95d3d79205e5"},"mac":"8417ef5a214a015a064fa539549f9747b62b67bc38954e3cea42111a3378fdef"},"address":"0240096ffcec7372ff51fc77672a830c67e3d29c","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account53.json b/networks/spree/keys/test_account53.json deleted file mode 100755 index 33fbbc2..0000000 --- a/networks/spree/keys/test_account53.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"33f7e0bc-cbb1-bbcc-043d-2be2f3a6b0f4","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"7fba572c25c2b7031953dc1051c1ad7e"},"ciphertext":"b56a6082ae6e991ca0c5c6517474e1a8d0ca999e7cdc11171e41e1a6c3a19323","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"1385aaf92e3d87ea9cecafd41a85c2accd1510747afe3e494adf51b22eefcc05"},"mac":"3e7092dc953cd974251b04419e338db0a0572ab6dfb804800fa1fadefcef7677"},"address":"96793a36a249c12db76542da6557153a168f01a3","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account54.json b/networks/spree/keys/test_account54.json deleted file mode 100755 index 961a89a..0000000 --- a/networks/spree/keys/test_account54.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"3c8692d4-2c98-8499-a464-31b666a36b42","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"ebd55f7b8a735b096f21990b58fe41bf"},"ciphertext":"10576fbcd6ff3312163963520e203299b49259fe9c89d7d2bbd4769c4768748f","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"8e468f83600910250f432588f981cc0191049a7e31885a7d11be8ca4119a0ad0"},"mac":"539018d5df32fd04d36aaeabed9859598a1c4b4baaa9df9a7da5c701e8fdedc1"},"address":"41a8414ba7ef274cd823742249dabf483e24357e","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account55.json b/networks/spree/keys/test_account55.json deleted file mode 100755 index b30a77d..0000000 --- a/networks/spree/keys/test_account55.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"73dbab88-1f1d-607f-f041-c23cedf02257","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"1e1709ba2edfef6cc4082bd5513bfca7"},"ciphertext":"a7180e55a1ac47cfb5c191519e4cda218d7a16338ab8c1f78bd418c129a1710f","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"a473c66dbc5a8cc5c85a95e281d24638bd84bce1af87c020e491cd99a61f4279"},"mac":"61b8d8c786b2aafe27fc26215891ff2f85d432ece3565edafa586bab6ebdbdf9"},"address":"5836f86339a6a88a5532fcc397e6262056f33b75","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account56.json b/networks/spree/keys/test_account56.json deleted file mode 100755 index 3532c59..0000000 --- a/networks/spree/keys/test_account56.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"8d27fa33-0993-943e-a233-a495ad80ec2e","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"94c0e79cc37676db75243fef73bd355a"},"ciphertext":"f72aa3214bd0fe096d93988985bb25c548831495ef9a9dd9f36531637de38e93","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"a63dccd711d08a065f14ed21c935a18ac6a42f3f7ab8f43aab199bccd731f950"},"mac":"862b4beac9932261d4a346815a7edac719d90edcc0b3a5e3f7b5f03958f4639d"},"address":"6e6751d50410b777b541a8bb0f8189fb97ea90ce","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account57.json b/networks/spree/keys/test_account57.json deleted file mode 100755 index 3c47e12..0000000 --- a/networks/spree/keys/test_account57.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"cccb11d9-b2d6-cc0c-e73c-9d82d6b36634","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"8c9dd12a7adccfbfac80d173db459bec"},"ciphertext":"88a86a9449b84b656fd7ac074952e589d449d7b7d2516c8f0a240cb41ff46aed","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"9f21a0d59f488b303951a8351bd71b5d0e6d9ed5c00d1fc5f11c410c0104c2b6"},"mac":"51ec705e793d466170440e1e780bf8c3b3a7f9c69e17e34a56197d9b3e835c98"},"address":"f0dcf392885f5f474ec3d65221caf1740a71fd23","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account58.json b/networks/spree/keys/test_account58.json deleted file mode 100755 index f1e3ee3..0000000 --- a/networks/spree/keys/test_account58.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"955cb9bc-02df-f2ac-7b94-becd24d3e8bc","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"715eec6b31d4e2c5efaba38108302efd"},"ciphertext":"1c314c9f3ad3c7a6442cfb6235c4eb1156754876dd846e5bd867f34636009a45","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"7958c94c7c299b08d8afbb39cbd42078bc411af2c3cff9096c94bd0e269ae42b"},"mac":"df4fff3c1dbe4aeb1748bfef52f917511e0b70ea61ae6cb47b8426940a869fab"},"address":"8a4e33bc8534e5d8285b25971858cb120547dc9b","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account59.json b/networks/spree/keys/test_account59.json deleted file mode 100755 index 37f8eaf..0000000 --- a/networks/spree/keys/test_account59.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"f1778a31-5f2b-3437-bc14-9beae0701506","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"848ee116d6963348159d2998caf4aa4e"},"ciphertext":"b58fc57351b82a4b64c29b46d543e3208cb405669a426238d81e3f7bde8d1737","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"1f18886180f7d8b8ad01d32d39914eec84c1762f29ce21f190210a679691c28b"},"mac":"268ec041c2edd6f64ffa1881789879426841ab5081a99ca946d3aad9aaff6362"},"address":"efdd95a951928fb0f872b6ccc6f633a6c266699f","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/test_account60.json b/networks/spree/keys/test_account60.json deleted file mode 100755 index 410d505..0000000 --- a/networks/spree/keys/test_account60.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"ffafc8fd-b1db-ae77-45fa-0642c298bc59","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"51a0ccf8e2104cc74b8d39542f72fa41"},"ciphertext":"14c80b7cf553de16bcf39be4489c7c034f0bb7ed688a78b75421722ed5f21b73","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fe66289d0a58d556b663669fec4356c88888dc994aaaa48d02c081ac06201803"},"mac":"6680f1d997c2a7453bcb3a2bd359940af11bb837d73d53075169a13ac828d030"},"address":"4dee03d3345805b60597230f83c4e96b9d01a124","name":"","meta":"{}"} \ No newline at end of file diff --git a/networks/spree/keys/validator.json b/networks/spree/keys/validator.json deleted file mode 100755 index f3eee24..0000000 --- a/networks/spree/keys/validator.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "id": "0902d04b-f26e-5c1f-e3ae-78d2c1cb16e7", - "version": 3, - "crypto": { - "cipher": "aes-128-ctr", - "cipherparams": { - "iv": "6a829fe7bc656d85f6c2e9fd21784952" - }, - "ciphertext": "1bfec0b054a648af8fdd0e85662206c65a4af0ed15fede4ad41ca9ab7b504ce2", - "kdf": "pbkdf2", - "kdfparams": { - "c": 10240, - "dklen": 32, - "prf": "hmac-sha256", - "salt": "95f96b5ee22dd537e06076eb8d7078eb7275d29af935782fe476696b11be50e5" - }, - "mac": "4af2215c3cd9447a5b0512d7d1c3ea5a4435981e1c8f48bf71d7a49c0e5b4986" - }, - "address": "00bd138abd70e2f00903268f3db08f2d25677c9e", - "name": "Validator0", - "meta": "{}" -} - diff --git a/start_ocean.sh b/start_ocean.sh index 4ed7a2e..251d897 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -25,34 +25,12 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v1.1.0} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.9.7} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.4.7} -export KEEPER_VERSION=${KEEPER_VERSION:-v0.13.2} -export FAUCET_VERSION=${FAUCET_VERSION:-v0.3.5} -export COMMONS_SERVER_VERSION=${COMMONS_SERVER_VERSION:-v2.4.1} -export COMMONS_CLIENT_VERSION=${COMMONS_CLIENT_VERSION:-v2.4.1} -export AGENT_VERSION=${AGENT_VERSION:-latest} - -export PARITY_IMAGE="parity/parity:v2.5.7-stable" +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} +export PROVIDER_VERSION=${PROVIDER_VERSION:-phase2} export PROJECT_NAME="ocean" export FORCEPULL="false" -# Ocean filesystem artifacts -export OCEAN_HOME="${HOME}/.ocean" - -# keeper options -export KEEPER_OWNER_ROLE_ADDRESS="${KEEPER_OWNER_ROLE_ADDRESS}" -export KEEPER_DEPLOY_CONTRACTS="true" -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" -export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/spree_node.yml" - -# Ganache specific option, these two options have no effect when not running ganache-cli -export GANACHE_DATABASE_PATH="${DIR}" -export GANACHE_REUSE_DATABASE="false" # Specify the ethereum default RPC container provider if [ ${IP} = "localhost" ]; then @@ -65,9 +43,6 @@ export KEEPER_RPC_URL="http://"${KEEPER_RPC_HOST}:${KEEPER_RPC_PORT} # Use this seed only on Spree! (Spree is the default.) export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another off lamp" -# Enable acl-contract validation in Secret-store -export CONFIGURE_ACL="true" -export ACL_CONTRACT_ADDRESS="" # Default Aquarius parameters: use Elasticsearch export DB_MODULE="elasticsearch" @@ -82,56 +57,27 @@ export DB_CLIENT_KEY="" export DB_CLIENT_CERT="" CHECK_ELASTIC_VM_COUNT=true -export BRIZO_WORKERS=${BRIZO_WORKERS:-5} -export BRIZO_LOG_LEVEL="INFO" -export EVENTS_HANDLER_LOG_LEVEL="INFO" -export BRIZO_IPFS_GATEWAY=https://ipfs.oceanprotocol.com - -# Set a valid parity address and password to have seamless interaction with the `keeper` -# it has to exist on the secret store signing node and as well on the keeper node -export PROVIDER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0 -export PROVIDER_PASSWORD=secret +#Provider +export PROVIDER_LOG_LEVEL=INFO +export PROVIDER_WORKERS=4 +export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com +export PROVIDER_KEYFILE_CONTENT='{"id":"4fabd7bf-bf01-2df3-2791-75b1ef4eebae","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d427c17019b8e3e8f09f321e1976c80f"},"ciphertext":"4ff54c4f47da24dfe6a712a7bf9e715a18bd99f690eedcacc817af2e1d08c1cd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fc6aef875f184722a70ad528f1b2efc5ceb868b6065b65630e50a83a458d2b50"},"mac":"4a40051eb54bef80b2cbcb209e2c8747531b0ee76d1a59b93d69b350be4af9dd"},"address":"00c6a0bc5cd0078d6cd0b659e8061b404cfa5704","name":"","meta":"{}"}' +export PROVIDER_ADDRESS=0x00c6a0bc5cd0078d6cd0b659e8061b404cfa5704 +export PROVIDER_PASSWORD=9B4653C8AA99E707798D603F226A0687 export PROVIDER_KEYFILE="/accounts/provider.json" -export ACCOUNTS_FOLDER="../accounts" + if [ ${IP} = "localhost" ]; then - export SECRET_STORE_URL=http://secret-store:12001 - export SIGNING_NODE_URL=http://secret-store-signing-node:8545 export AQUARIUS_URI=http://aquarius:5000 - export FAUCET_URL=http://localhost:3001 - export COMMONS_SERVER_URL=http://localhost:4000 - export COMMONS_CLIENT_URL=http://localhost:3000 - export COMMONS_KEEPER_RPC_HOST=http://localhost:8545 - export COMMONS_SECRET_STORE_URL=http://localhost:12001 export BRIZO_URL=http://localhost:8030 else - export SECRET_STORE_URL=http://${IP}:12001 - export SIGNING_NODE_URL=http://${IP}:8545 export AQUARIUS_URI=http://${IP}:5000 - export FAUCET_URL=http://${IP}:3001 - export COMMONS_SERVER_URL=http://${IP}:4000 - export COMMONS_CLIENT_URL=http://${IP}:3000 - export COMMONS_KEEPER_RPC_HOST=http://${IP}:8545 - export COMMONS_SECRET_STORE_URL=http://${IP}:12001 export BRIZO_URL=http://${IP}:8030 fi -# Default Faucet options -export FAUCET_TIMESPAN=${FAUCET_TIMESPAN:-24} - -#commons -export COMMONS_BRIZO_URL=${BRIZO_URL} -export COMMONS_AQUARIUS_URI=${AQUARIUS_URI} -export COMMONS_FAUCET_URL=${FAUCET_URL} -export COMMONS_IPFS_GATEWAY_URI=https://ipfs.oceanprotocol.com -export COMMONS_IPFS_NODE_URI=https://ipfs.oceanprotocol.com:443 #export OPERATOR_SERVICE_URL=http://127.0.0.1:8050 export OPERATOR_SERVICE_URL=https://operator-api.operator.dev-ocean.com -#agent -# private key for agent, public address: 0x6f2b82bB771687b69d0932c7386742804144ae7D -# NEVER USE this address in production ! -export AGENT_PRIVATE_KEY='axis talent grab cushion figure couple plug ostrich file false jealous nest' # Export User UID and GID export LOCAL_USER_ID=$(id -u) @@ -185,13 +131,6 @@ function show_banner { echo "" } -function configure_secret_store { - # restore default secret store config (Issue #126) - if [ -e "$DIR/networks/secret-store/config/config.toml.save" ]; then - cp "$DIR/networks/secret-store/config/config.toml.save" \ - "$DIR/networks/secret-store/config/config.toml" - fi -} function check_if_owned_by_root { if [ -d "$OCEAN_HOME" ]; then @@ -207,11 +146,6 @@ function check_if_owned_by_root { fi } -function clean_local_contracts { - rm -f "${KEEPER_ARTIFACTS_FOLDER}/ready" - rm -f "${KEEPER_ARTIFACTS_FOLDER}/*.spree.json" - rm -f "${KEEPER_ARTIFACTS_FOLDER}/*.development.json" -} function check_max_map_count { vm_max_map_count=$(docker run --rm busybox sysctl -q vm.max_map_count) @@ -229,17 +163,10 @@ check_if_owned_by_root show_banner COMPOSE_FILES="" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/dashboard.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/keeper_contracts.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/commons.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/dashboard.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/events_handler.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store_signing_node.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/faucet.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/agent.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider.yml" DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}" while :; do @@ -260,21 +187,6 @@ while :; do DOCKER_COMPOSE_EXTRA_OPTS+=" --no-ansi" unset COLOR_R COLOR_G COLOR_Y COLOR_B COLOR_M COLOR_C COLOR_RESET ;; - ################################################# - # Version switches - ################################################# - --latest) - export AQUARIUS_VERSION="latest" - export BRIZO_VERSION="latest" - export EVENTS_HANDLER_VERSION="latest" - export KEEPER_VERSION="latest" - # TODO: Change label on Docker to refer `latest` to `master` - export FAUCET_VERSION="latest" - export AGENT_VERSION="latest" - export COMMONS_SERVER_VERSION="latest" - export COMMONS_CLIENT_VERSION="latest" - printf $COLOR_Y'Switched to latest components...\n\n'$COLOR_RESET - ;; --force-pull) export FORCEPULL="true" printf $COLOR_Y'Pulling the latest revision of the used Docker images...\n\n'$COLOR_RESET @@ -282,57 +194,14 @@ while :; do ################################################# # Exclude switches ################################################# - --no-pleuston) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/commons.yml/}" - printf $COLOR_Y'Starting without Commons...\n\n'$COLOR_RESET - ;; - --no-commons) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/commons.yml/}" - printf $COLOR_Y'Starting without Commons...\n\n'$COLOR_RESET - ;; - --no-events-handler) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/events_handler.yml/}" - printf $COLOR_Y'Starting without Events Handler...\n\n'$COLOR_RESET - ;; - --no-brizo) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/brizo.yml/}" + --no-provider) + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}" printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET ;; --no-aquarius) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_elasticsearch.yml/}" printf $COLOR_Y'Starting without Aquarius...\n\n'$COLOR_RESET ;; - --no-secret-store) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}" - printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET - ;; - --no-faucet) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/faucet.yml/}" - printf $COLOR_Y'Starting without Faucet...\n\n'$COLOR_RESET - ;; - --no-dashboard) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}" - printf $COLOR_Y'Starting without Dashboard ...\n\n'$COLOR_RESET - ;; - --no-acl-contract) - export CONFIGURE_ACL="false" - printf $COLOR_Y'Disabling acl validation in secret-store...\n\n'$COLOR_RESET - ;; - --no-agent) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/agent.yml/}" - printf $COLOR_Y'Starting without Agent ...\n\n'$COLOR_RESET - ;; - ################################################# - # Only Secret Store - ################################################# - --only-secret-store) - COMPOSE_FILES="" - COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" - COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" - COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store_signing_node.yml" - NODE_COMPOSE_FILE="" - printf $COLOR_Y'Starting only Secret Store...\n\n'$COLOR_RESET - ;; ################################################# # MongoDB ################################################# @@ -346,74 +215,6 @@ while :; do printf $COLOR_Y'Starting with MongoDB...\n\n'$COLOR_RESET ;; ################################################# - # Contract/Storage switches - ################################################# - --reuse-ganache-database) - export GANACHE_REUSE_DATABASE="true" - printf $COLOR_Y'Starting and reusing the database...\n\n'$COLOR_RESET - ;; - ################################################# - # Node type switches - ################################################# - # spins up a new ganache blockchain - --local-ganache-node) - export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/ganache_node.yml" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store.yml/}" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/secret_store_signing_node.yml/}" - export KEEPER_MNEMONIC='' - export KEEPER_NETWORK_NAME="development" - printf $COLOR_Y'Starting with local Ganache node...\n\n'$COLOR_RESET - printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET - printf $COLOR_Y'Starting without Secret Store signing node...\n\n'$COLOR_RESET - ;; - # connects you to nile ocean testnet - --local-nile-node) - export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/nile_node.yml" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}" - export KEEPER_MNEMONIC='' - export KEEPER_NETWORK_NAME="nile" - export KEEPER_DEPLOY_CONTRACTS="false" - export ACL_CONTRACT_ADDRESS="$(get_acl_address ${KEEPER_VERSION})" - printf $COLOR_Y'Starting with local Nile node...\n\n'$COLOR_RESET - ;; - # connects you to duero ocean testnet - --local-duero-node) - export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/duero_node.yml" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}" - export KEEPER_MNEMONIC='' - export KEEPER_NETWORK_NAME="duero" - export KEEPER_DEPLOY_CONTRACTS="false" - export ACL_CONTRACT_ADDRESS="$(get_acl_address ${KEEPER_VERSION})" - printf $COLOR_Y'Starting with local Duero node...\n\n'$COLOR_RESET - ;; - # connects you to Pacific ocean network - --local-pacific-node) - export NODE_COMPOSE_FILE="${COMPOSE_DIR}/nodes/pacific_node.yml" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/keeper_contracts.yml/}" - export KEEPER_MNEMONIC='' - export KEEPER_NETWORK_NAME="pacific" - export KEEPER_DEPLOY_CONTRACTS="false" - export ACL_CONTRACT_ADDRESS="$(get_acl_address ${KEEPER_VERSION})" - printf $COLOR_Y'Starting with local Pacific node...\n\n'$COLOR_RESET - printf $COLOR_Y'Starting without Secret Store...\n\n'$COLOR_RESET - ;; - # spins up spree local testnet - --local-spree-node) - 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" - 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 ################################################# --purge) @@ -421,18 +222,6 @@ while :; do eval docker-compose --project-name=$PROJECT_NAME "$COMPOSE_FILES" -f "${NODE_COMPOSE_FILE}" down docker network rm ${PROJECT_NAME}_default || true docker network rm ${PROJECT_NAME}_backend || true - docker network rm ${PROJECT_NAME}_secretstore || true - docker volume rm ${PROJECT_NAME}_secret-store || true - docker volume rm ${PROJECT_NAME}_keeper-node-duero || true - docker volume rm ${PROJECT_NAME}_keeper-node-nile || true - docker volume rm ${PROJECT_NAME}_keeper-node-pacific || true - docker volume rm ${PROJECT_NAME}_faucet || true - read -p "Are you sure you want to delete $KEEPER_ARTIFACTS_FOLDER? (y/N): " -n 1 -r - echo - if [[ $REPLY =~ ^[Yy]$ ]] - then - rm -rf "${KEEPER_ARTIFACTS_FOLDER}" - fi ;; --) # End of all options. shift @@ -444,10 +233,7 @@ while :; do ;; *) [ ${CHECK_ELASTIC_VM_COUNT} = "true" ] && check_max_map_count - printf $COLOR_Y'Starting Ocean...\n\n'$COLOR_RESET - configure_secret_store - [ -n "${NODE_COMPOSE_FILE}" ] && COMPOSE_FILES+=" -f ${NODE_COMPOSE_FILE}" - [ ${KEEPER_DEPLOY_CONTRACTS} = "true" ] && clean_local_contracts + printf $COLOR_Y'Starting Ocean V3...\n\n'$COLOR_RESET [ ${FORCEPULL} = "true" ] && eval docker-compose "$DOCKER_COMPOSE_EXTRA_OPTS" --project-name=$PROJECT_NAME "$COMPOSE_FILES" pull eval docker-compose "$DOCKER_COMPOSE_EXTRA_OPTS" --project-name=$PROJECT_NAME "$COMPOSE_FILES" up --remove-orphans break From c9a32edff8d7ddeef3bcb7078fb1c051ed1a47f7 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Fri, 26 Jun 2020 08:39:52 -0700 Subject: [PATCH 02/51] fix provider --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 251d897..66bf6a0 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -62,7 +62,7 @@ CHECK_ELASTIC_VM_COUNT=true export PROVIDER_LOG_LEVEL=INFO export PROVIDER_WORKERS=4 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com -export PROVIDER_KEYFILE_CONTENT='{"id":"4fabd7bf-bf01-2df3-2791-75b1ef4eebae","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d427c17019b8e3e8f09f321e1976c80f"},"ciphertext":"4ff54c4f47da24dfe6a712a7bf9e715a18bd99f690eedcacc817af2e1d08c1cd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fc6aef875f184722a70ad528f1b2efc5ceb868b6065b65630e50a83a458d2b50"},"mac":"4a40051eb54bef80b2cbcb209e2c8747531b0ee76d1a59b93d69b350be4af9dd"},"address":"00c6a0bc5cd0078d6cd0b659e8061b404cfa5704","name":"","meta":"{}"}' +export PROVIDER_ENCRYPTED_KEY='{"id":"4fabd7bf-bf01-2df3-2791-75b1ef4eebae","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d427c17019b8e3e8f09f321e1976c80f"},"ciphertext":"4ff54c4f47da24dfe6a712a7bf9e715a18bd99f690eedcacc817af2e1d08c1cd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fc6aef875f184722a70ad528f1b2efc5ceb868b6065b65630e50a83a458d2b50"},"mac":"4a40051eb54bef80b2cbcb209e2c8747531b0ee76d1a59b93d69b350be4af9dd"},"address":"00c6a0bc5cd0078d6cd0b659e8061b404cfa5704","name":"","meta":"{}"}' export PROVIDER_ADDRESS=0x00c6a0bc5cd0078d6cd0b659e8061b404cfa5704 export PROVIDER_PASSWORD=9B4653C8AA99E707798D603F226A0687 export PROVIDER_KEYFILE="/accounts/provider.json" From acc399f26d89c3d583bda05d3794cdaf1e650d0a Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Fri, 26 Jun 2020 11:18:16 -0700 Subject: [PATCH 03/51] fix provider --- compose-files/provider.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index c409232..5a8dff2 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -12,7 +12,7 @@ services: PARITY_URL: ${KEEPER_RPC_URL} PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} - PROVIDER_KEYFILE_CONTENT: ${PROVIDER_KEYFILE_CONTENT} + PROVIDER_ENCRYPTED_KEY: ${PROVIDER_ENCRYPTED_KEY} LOG_LEVEL: ${PROVIDER_LOG_LEVEL} OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030' BRIZO_WORKERS: ${PROVIDER_WORKERS} From b6df4459ffd2d6f93c7bcc449354db7d83bdfe22 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 28 Jun 2020 15:15:53 +0300 Subject: [PATCH 04/51] add ganache --- compose-files/aquarius.yml | 2 +- compose-files/aquarius_elasticsearch.yml | 4 ++-- compose-files/aquarius_mongodb.yml | 4 ++-- compose-files/ganache.yml | 10 ++++++++++ compose-files/provider.yml | 2 +- start_ocean.sh | 7 ++++++- 6 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 compose-files/ganache.yml diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 9491abb..9338156 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -6,7 +6,7 @@ services: - 5000:5000 networks: backend: - ipv4_address: 172.15.0.15 + ipv4_address: 172.15.0.5 environment: DB_MODULE: ${DB_MODULE} DB_HOSTNAME: ${DB_HOSTNAME} diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml index 266e31e..cf7babf 100644 --- a/compose-files/aquarius_elasticsearch.yml +++ b/compose-files/aquarius_elasticsearch.yml @@ -4,7 +4,7 @@ services: image: elasticsearch:6.8.3 networks: backend: - ipv4_address: 172.15.0.11 + ipv4_address: 172.15.0.6 environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" MAX_MAP_COUNT: "64000" @@ -16,7 +16,7 @@ services: - 5000:5000 networks: backend: - ipv4_address: 172.15.0.15 + ipv4_address: 172.15.0.5 depends_on: - elasticsearch environment: diff --git a/compose-files/aquarius_mongodb.yml b/compose-files/aquarius_mongodb.yml index f729df5..d4e2fb0 100644 --- a/compose-files/aquarius_mongodb.yml +++ b/compose-files/aquarius_mongodb.yml @@ -5,14 +5,14 @@ services: command: mongod networks: backend: - ipv4_address: 172.15.0.11 + ipv4_address: 172.15.0.7 aquarius: image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} ports: - 5000:5000 networks: backend: - ipv4_address: 172.15.0.15 + ipv4_address: 172.15.0.5 depends_on: - mongodb environment: diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml new file mode 100644 index 0000000..4ddd4c8 --- /dev/null +++ b/compose-files/ganache.yml @@ -0,0 +1,10 @@ +version: '3' +services: + ganache: + image: trufflesuite/ganache-cli:latest + ports: + - 8545:8545 + networks: + backend: + ipv4_address: 172.15.0.3 + \ No newline at end of file diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 5a8dff2..c3431cc 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -6,7 +6,7 @@ services: - 8030:8030 networks: backend: - ipv4_address: 172.15.0.17 + ipv4_address: 172.15.0.4 environment: NETWORK_URL: ${KEEPER_RPC_URL} PARITY_URL: ${KEEPER_RPC_URL} diff --git a/start_ocean.sh b/start_ocean.sh index 66bf6a0..e4ec1d8 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -167,6 +167,7 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/dashboard.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ganache.yml" DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}" while :; do @@ -196,7 +197,11 @@ while :; do ################################################# --no-provider) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/provider.yml/}" - printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET + printf $COLOR_Y'Starting without Provider...\n\n'$COLOR_RESET + ;; + --no-ganache) + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ganache.yml/}" + printf $COLOR_Y'Starting without Ganache...\n\n'$COLOR_RESET ;; --no-aquarius) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_elasticsearch.yml/}" From 96a0df677bdc9be2ce00ce4e5d03aad415075c99 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 28 Jun 2020 15:22:44 +0300 Subject: [PATCH 05/51] make dashboard optional --- start_ocean.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/start_ocean.sh b/start_ocean.sh index e4ec1d8..80f099a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -207,6 +207,10 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_elasticsearch.yml/}" printf $COLOR_Y'Starting without Aquarius...\n\n'$COLOR_RESET ;; + --no-dashboard) + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}" + printf $COLOR_Y'Starting without Dashboard ...\n\n'$COLOR_RESET + ;; ################################################# # MongoDB ################################################# From 13733f21de830bf65229da802376ef7f257bc591 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 28 Jun 2020 15:33:29 +0300 Subject: [PATCH 06/51] fix elastic --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 80f099a..37a444c 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -46,7 +46,7 @@ export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another # Default Aquarius parameters: use Elasticsearch export DB_MODULE="elasticsearch" -export DB_HOSTNAME="172.15.0.11" +export DB_HOSTNAME="172.15.0.6" export DB_PORT="9200" export DB_USERNAME="elastic" export DB_PASSWORD="changeme" From 76477e8301b8c9bd13d4047dff528781b98ecd88 Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 28 Jun 2020 15:44:30 +0300 Subject: [PATCH 07/51] fix mongodb --- compose-files/aquarius_mongodb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/aquarius_mongodb.yml b/compose-files/aquarius_mongodb.yml index d4e2fb0..08c24bb 100644 --- a/compose-files/aquarius_mongodb.yml +++ b/compose-files/aquarius_mongodb.yml @@ -5,7 +5,7 @@ services: command: mongod networks: backend: - ipv4_address: 172.15.0.7 + ipv4_address: 172.15.0.6 aquarius: image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} ports: From 1b5acb5971bb78b471abe5787e348e4a9ff3717c Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 1 Jul 2020 19:20:33 +0300 Subject: [PATCH 08/51] Update start_ocean.sh --- start_ocean.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 37a444c..e7b8cf8 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -34,7 +34,7 @@ export FORCEPULL="false" # Specify the ethereum default RPC container provider if [ ${IP} = "localhost" ]; then - export KEEPER_RPC_HOST="keeper-node" + export KEEPER_RPC_HOST="172.15.0.3" else export KEEPER_RPC_HOST=${IP} fi @@ -68,8 +68,8 @@ export PROVIDER_PASSWORD=9B4653C8AA99E707798D603F226A0687 export PROVIDER_KEYFILE="/accounts/provider.json" if [ ${IP} = "localhost" ]; then - export AQUARIUS_URI=http://aquarius:5000 - export BRIZO_URL=http://localhost:8030 + export AQUARIUS_URI=http://172.15.0.5:5000 + export BRIZO_URL=http://172.15.0.4:8030 else export AQUARIUS_URI=http://${IP}:5000 export BRIZO_URL=http://${IP}:8030 From 90839158abce4e8ace9005a28f38129f76b2500c Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Mon, 6 Jul 2020 10:18:07 -0700 Subject: [PATCH 09/51] more ganache options --- compose-files/ganache.yml | 2 +- start_ocean.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml index 4ddd4c8..f369080 100644 --- a/compose-files/ganache.yml +++ b/compose-files/ganache.yml @@ -7,4 +7,4 @@ services: networks: backend: ipv4_address: 172.15.0.3 - \ No newline at end of file + entrypoint: ["node", "/app/ganache-core.docker.cli.js","--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] \ No newline at end of file diff --git a/start_ocean.sh b/start_ocean.sh index 37a444c..7e00874 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -26,7 +26,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-phase2} +export PROVIDER_VERSION=${PROVIDER_VERSION:-alex} export PROJECT_NAME="ocean" export FORCEPULL="false" @@ -34,14 +34,14 @@ export FORCEPULL="false" # Specify the ethereum default RPC container provider if [ ${IP} = "localhost" ]; then - export KEEPER_RPC_HOST="keeper-node" + export KEEPER_RPC_HOST="ganache" else export KEEPER_RPC_HOST=${IP} fi export KEEPER_RPC_PORT="8545" export KEEPER_RPC_URL="http://"${KEEPER_RPC_HOST}:${KEEPER_RPC_PORT} # Use this seed only on Spree! (Spree is the default.) -export KEEPER_MNEMONIC="taxi music thumb unique chat sand crew more leg another off lamp" +export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand crew more leg another off lamp"} # Default Aquarius parameters: use Elasticsearch From a42e4bb73e92928f897789b659aafebe4aedd744 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 8 Jul 2020 15:28:31 +0200 Subject: [PATCH 10/51] update envvar --- compose-files/provider.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index c3431cc..dfe56d5 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -15,8 +15,7 @@ services: PROVIDER_ENCRYPTED_KEY: ${PROVIDER_ENCRYPTED_KEY} LOG_LEVEL: ${PROVIDER_LOG_LEVEL} OCEAN_PROVIDER_URL: 'http://0.0.0.0:8030' - BRIZO_WORKERS: ${PROVIDER_WORKERS} + OCEAN_PROVIDER_WORKERS: ${PROVIDER_WORKERS} IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} OCEAN_PROVIDER_TIMEOUT: '9000' - OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} - \ No newline at end of file + OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} \ No newline at end of file From fbf261ef2226c02fb79f8ce4b809fbfe81167515 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Tue, 14 Jul 2020 13:54:05 +0300 Subject: [PATCH 11/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index cac2b3b..124c393 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -26,7 +26,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-alex} +export PROVIDER_VERSION=${PROVIDER_VERSION:-phase2} export PROJECT_NAME="ocean" export FORCEPULL="false" From 5118cbe8b4250ea700b10fd94d7c36ca1582c85b Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 10:31:55 +0300 Subject: [PATCH 12/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 124c393..aef1fb4 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -26,7 +26,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Commons export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-phase2} +export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export PROJECT_NAME="ocean" export FORCEPULL="false" From b2fa3c12ea563547177c5c80a95856f894a5d512 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 15 Jul 2020 11:27:54 +0300 Subject: [PATCH 13/51] Update provider.yml --- compose-files/provider.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index dfe56d5..4b58e91 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -18,4 +18,5 @@ services: OCEAN_PROVIDER_WORKERS: ${PROVIDER_WORKERS} IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} OCEAN_PROVIDER_TIMEOUT: '9000' - OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} \ No newline at end of file + OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} + ARTIFACTS_PATH: '/ocean-provider/artifacts' From c148e447ca5bfcd7b2abd39de846ec30de999b1c Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 15 Jul 2020 10:28:54 +0200 Subject: [PATCH 14/51] Fix provider issue, remove references to keeper --- compose-files/provider.yml | 5 +++-- start_ocean.sh | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index dfe56d5..7a931a1 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -8,8 +8,9 @@ services: backend: ipv4_address: 172.15.0.4 environment: - NETWORK_URL: ${KEEPER_RPC_URL} - PARITY_URL: ${KEEPER_RPC_URL} + ARTIFACTS_PATH: ${OCEAN_ARTIFACTS_FOLDER:-/ocean-provider/artifacts} + NETWORK_URL: ${NETWORK_RPC_URL} + PARITY_URL: ${NETWORK_RPC_URL} PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} PROVIDER_ENCRYPTED_KEY: ${PROVIDER_ENCRYPTED_KEY} diff --git a/start_ocean.sh b/start_ocean.sh index aef1fb4..2f6e53d 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -24,7 +24,7 @@ export BRIZO_ENV_FILE="${DIR}/brizo.env" DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" -# Default versions of Aquarius, Brizo, Keeper Contracts and Commons +# Default versions of Aquarius, Brizo, Ocean Contracts and Commons export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} @@ -34,12 +34,12 @@ export FORCEPULL="false" # Specify the ethereum default RPC container provider if [ ${IP} = "localhost" ]; then - export KEEPER_RPC_HOST="172.15.0.3" + export NETWORK_RPC_HOST="172.15.0.3" else - export KEEPER_RPC_HOST=${IP} + export NETWORK_RPC_HOST=${IP} fi -export KEEPER_RPC_PORT="8545" -export KEEPER_RPC_URL="http://"${KEEPER_RPC_HOST}:${KEEPER_RPC_PORT} +export NETWORK_RPC_PORT="8545" +export NETWORK_RPC_URL="http://"${NETWORK_RPC_HOST}:${NETWORK_RPC_PORT} # Use this seed only on Spree! (Spree is the default.) export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand crew more leg another off lamp"} @@ -106,18 +106,18 @@ COLOR_C="\033[0;36m" # cyan COLOR_RESET="\033[00m" function get_acl_address { - # detect keeper version + # detect ocean contracts version local version="${1:-latest}" - # sesarch in the file for the keeper version - line=$(grep "^${version}=" "${DIR}/ACL/${KEEPER_NETWORK_NAME}_addresses.txt") + # sesarch in the file for the ocean contracts version + line=$(grep "^${version}=" "${DIR}/ACL/${OCEAN_NETWORK_NAME}_addresses.txt") # set address 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") + line=$(grep "^latest=" "${DIR}/ACL/${OCEAN_NETWORK_NAME}_addresses.txt") # set address address="${line##*=}" fi @@ -138,9 +138,9 @@ function check_if_owned_by_root { if [ "$uid" = "0" ]; then printf $COLOR_R"WARN: $OCEAN_HOME is owned by root\n"$COLOR_RESET >&2 else - uid=$(ls -nd "$KEEPER_ARTIFACTS_FOLDER" | awk '{print $3;}') + uid=$(ls -nd "$OCEAN_ARTIFACTS_FOLDER" | awk '{print $3;}') if [ "$uid" = "0" ]; then - printf $COLOR_R"WARN: $KEEPER_ARTIFACTS_FOLDER is owned by root\n"$COLOR_RESET >&2 + printf $COLOR_R"WARN: $OCEAN_ARTIFACTS_FOLDER is owned by root\n"$COLOR_RESET >&2 fi fi fi From 0299f33836ba99fc31c703b2e7c89ed948809e51 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 15 Jul 2020 10:29:53 +0200 Subject: [PATCH 15/51] Remove extra line. --- compose-files/provider.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 8b360cf..76689bd 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -20,4 +20,3 @@ services: IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} OCEAN_PROVIDER_TIMEOUT: '9000' OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} - ARTIFACTS_PATH: '/ocean-provider/artifacts' From b623171cac6d951a8d2ede55cffca4866cdf5454 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Wed, 29 Jul 2020 22:24:22 -0700 Subject: [PATCH 16/51] temporary provider will use one worker --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 2f6e53d..2f31ae8 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -60,7 +60,7 @@ CHECK_ELASTIC_VM_COUNT=true #Provider export PROVIDER_LOG_LEVEL=INFO -export PROVIDER_WORKERS=4 +export PROVIDER_WORKERS=1 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com export PROVIDER_ENCRYPTED_KEY='{"id":"4fabd7bf-bf01-2df3-2791-75b1ef4eebae","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d427c17019b8e3e8f09f321e1976c80f"},"ciphertext":"4ff54c4f47da24dfe6a712a7bf9e715a18bd99f690eedcacc817af2e1d08c1cd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fc6aef875f184722a70ad528f1b2efc5ceb868b6065b65630e50a83a458d2b50"},"mac":"4a40051eb54bef80b2cbcb209e2c8747531b0ee76d1a59b93d69b350be4af9dd"},"address":"00c6a0bc5cd0078d6cd0b659e8061b404cfa5704","name":"","meta":"{}"}' export PROVIDER_ADDRESS=0x00c6a0bc5cd0078d6cd0b659e8061b404cfa5704 From 07131ceddcdb5d6c2b80dc8c497b64466b2e410a Mon Sep 17 00:00:00 2001 From: ssallam Date: Tue, 8 Sep 2020 10:39:52 +0200 Subject: [PATCH 17/51] Support decentralized ddo --- compose-files/aquarius_elasticsearch.yml | 6 +++++- compose-files/provider.yml | 1 + start_ocean.sh | 10 ++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml index cf7babf..c29fa11 100644 --- a/compose-files/aquarius_elasticsearch.yml +++ b/compose-files/aquarius_elasticsearch.yml @@ -31,4 +31,8 @@ services: DB_CLIENT_KEY: ${DB_CLIENT_KEY} DB_CLIENT_CERT: ${DB_CLIENT_CERT} LOG_LEVEL: DEBUG - + EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8" + EVENTS_CONTRACT_ADDRESS: ${DDO_CONTRACT_ADDRESS} + EVENTS_RPC: "http://172.15.0.3:8545" + EVENTS_ALLOW: "0" + RUN_EVENTS_MONITOR: "1" diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 76689bd..1e8beb4 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -11,6 +11,7 @@ services: ARTIFACTS_PATH: ${OCEAN_ARTIFACTS_FOLDER:-/ocean-provider/artifacts} NETWORK_URL: ${NETWORK_RPC_URL} PARITY_URL: ${NETWORK_RPC_URL} + PROVIDER_PRIVATE_KEY: ${PROVIDER_PRIVATE_KEY} PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} PROVIDER_ENCRYPTED_KEY: ${PROVIDER_ENCRYPTED_KEY} diff --git a/start_ocean.sh b/start_ocean.sh index 2f31ae8..a5e8dfb 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -60,12 +60,14 @@ CHECK_ELASTIC_VM_COUNT=true #Provider export PROVIDER_LOG_LEVEL=INFO -export PROVIDER_WORKERS=1 +export PROVIDER_WORKERS=1 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com -export PROVIDER_ENCRYPTED_KEY='{"id":"4fabd7bf-bf01-2df3-2791-75b1ef4eebae","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"d427c17019b8e3e8f09f321e1976c80f"},"ciphertext":"4ff54c4f47da24dfe6a712a7bf9e715a18bd99f690eedcacc817af2e1d08c1cd","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"fc6aef875f184722a70ad528f1b2efc5ceb868b6065b65630e50a83a458d2b50"},"mac":"4a40051eb54bef80b2cbcb209e2c8747531b0ee76d1a59b93d69b350be4af9dd"},"address":"00c6a0bc5cd0078d6cd0b659e8061b404cfa5704","name":"","meta":"{}"}' -export PROVIDER_ADDRESS=0x00c6a0bc5cd0078d6cd0b659e8061b404cfa5704 -export PROVIDER_PASSWORD=9B4653C8AA99E707798D603F226A0687 +export PROVIDER_PRIVATE_KEY=0x9bf5d7e4978ed5206f760e6daded34d657572bd49fa5b3fe885679329fb16b16 +export PROVIDER_ENCRYPTED_KEY='' +export PROVIDER_ADDRESS='' +export PROVIDER_PASSWORD='' export PROVIDER_KEYFILE="/accounts/provider.json" +export DDO_CONTRACT_ADDRESS='' if [ ${IP} = "localhost" ]; then export AQUARIUS_URI=http://172.15.0.5:5000 From 528df38607ed548a4bfec4c2423d783f767551a4 Mon Sep 17 00:00:00 2001 From: ssallam Date: Tue, 8 Sep 2020 11:29:54 +0200 Subject: [PATCH 18/51] Make ganache run persist with db cache --- compose-files/ganache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml index f369080..00f6516 100644 --- a/compose-files/ganache.yml +++ b/compose-files/ganache.yml @@ -7,4 +7,4 @@ services: networks: backend: ipv4_address: 172.15.0.3 - entrypoint: ["node", "/app/ganache-core.docker.cli.js","--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] \ No newline at end of file + entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--blockTime", "2", "--db", "./ganache_cache", "--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] \ No newline at end of file From 12d6e01a680d83ee2c185428baec71fac95bec3e Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 8 Sep 2020 18:04:08 +0200 Subject: [PATCH 19/51] add discord link --- .banner | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.banner b/.banner index f9d57c2..1d9273a 100644 --- a/.banner +++ b/.banner @@ -21,7 +21,7 @@ Get info: oceanprotocol.com Get docs: docs.oceanprotocol.com Get code: github.com/oceanprotocol - Get help: gitter.im/oceanprotocol/Lobby + Get help: discord.gg/TnXjkR5 --- From 09c97c7d21a683d75362424f093ea3ba843880fa Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 8 Sep 2020 18:23:10 +0200 Subject: [PATCH 20/51] script cleanup, sync script and docs --- README.md | 172 +++++++------------------------------------------ start_ocean.sh | 41 ++---------- 2 files changed, 32 insertions(+), 181 deletions(-) diff --git a/README.md b/README.md index a91b1c5..3756919 100644 --- a/README.md +++ b/README.md @@ -12,17 +12,10 @@ - [Component Versions](#component-versions) - [All Options](#all-options) - [Docker Building Blocks](#docker-building-blocks) - - [Commons](#commons) - [Aquarius](#aquarius) - - [Brizo](#brizo) - - [Events Handler](#events-handler) - - [Keeper Node](#keeper-node) - - [Secret Store](#secret-store) - - [Faucet](#faucet) - - [Agent](#agent) + - [Provider](#provider) + - [Ganache](#ganache) - [Dashboard](#dashboard) -- [Spree Network](#spree-network) - - [Spree Mnemonic](#spree-mnemonic) - [Contributing](#contributing) - [License](#license) @@ -35,7 +28,6 @@ You need to have the newest versions of: - Linux or macOS. Windows is not currently supported. If you are on Windows, we recommend running Barge inside a Linux VM. Another option might be to use the [Windows Subsystem for Linux (WSL)](https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux). - [Docker](https://www.docker.com/get-started) - [Docker Compose](https://docs.docker.com/compose/) -- If you want to use Azure Storage with Brizo (and you might not), then you must edit the file [`brizo.env`](./brizo.env) to have your Azure credentials. To learn how to get those credentials, see our tutorial to [Set up Azure Storage](https://docs.oceanprotocol.com/tutorials/azure-for-brizo/). ## Get Started @@ -48,7 +40,7 @@ cd barge ./start_ocean.sh ``` -That will run the current default versions of Aquarius, Brizo, Events Handler, Commons, Keeper Contracts, and Faucet. It will also run a local Spree network (i.e. `--local-spree-node`). +That will run the current default versions of Aquarius, Provider, Ganache. Welcome to Ocean Protocol @@ -66,78 +58,40 @@ The startup script comes with a set of options for customizing various things. The default versions are always a combination of component versions which are considered stable. -| Aquarius | Brizo | Events Handler | Keeper | Commons | Faucet | Agent | -| -------- | -------- | -------------- | --------- | -------- | -------- | ------ | -| `v1.1.0` | `v0.9.7` | `v0.4.7` | `v0.13.2` | `v2.4.1` | `v0.3.5` | `latest` | - -You can use the `--latest` option to pull the most recent releases for all components, which are always tagged as `latest` in Docker. +| Aquarius | Provider | Ganache | +| -------- | -------- | -------- | +| `vx.x.x` | `vx.x.x` | `latest` | You can override the Docker image tag used for a particular component by setting its associated environment variable before calling `start_ocean.sh`: - `AQUARIUS_VERSION` -- `BRIZO_VERSION` -- `EVENTS_HANDLER_VERSION` -- `KEEPER_VERSION` -- `COMMONS_CLIENT_VERSION` -- `COMMONS_SERVER_VERSION` -- `FAUCET_VERSION` -- `AGENT_VERSION` +- `PROVIDER_VERSION` For example: ```bash -export BRIZO_VERSION=v0.9.1 +export AQUARIUS_VERSION=v2.0.0 ./start_ocean.sh ``` -will use the default Docker image tags for Aquarius, Keeper Contracts and Commons, but `v0.8.1` for Brizo. - -> If you use the `--latest` option, then the `latest` Docker images will be used _regardless of whether you set any environment variables beforehand._ - ### All Options | Option | Description | | -------------------------- | ----------------------------------------------------------------------------------------------- | -| `--latest` | Pull Docker images tagged with `latest`, referring to the latest release version. | -| `--no-commons` | Start up Ocean without the `commons` Building Block. Helpful for development on `commons`. | | `--no-aquarius` | Start up Ocean without the `aquarius` Building Block. | -| `--no-brizo` | Start up Ocean without the `brizo` Building Block. | -| `--no-events-handler` | Start up Ocean without the `events-handler` Building Block. | -| `--no-secret-store` | Start up Ocean without the `secret-store` Building Block. | -| `--no-faucet` | Start up Ocean without the `faucet` Building Block. | -| `--no-acl-contract` | Disables the configuration of secret store's ACL contract address | +| `--no-provider` | Start up Ocean without the `provider` Building Block. | +| `--no-ganache` | Start up Ocean without the `ganache` Building Block. | | `--no-dashboard` | Start up Ocean without the `dashboard` Building Block. | -| `--no-agent` | Start up Ocean without the `agent` Building Block. | | `--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 | -| `--reuse-ganache-database` | Configures a running `ganache` node to use a persistent database. | | `--force-pull` | Force pulling the latest revision of the used Docker images. | | `--purge` | Removes the Docker containers, volumes, artifact folder and networks used by the script. | -| `--exposeip` | Binds the components to that specific ip. Exemple: ./start_ocean.sh --exposeip 192.168.0.1 | +| `--exposeip` | Binds the components to that specific ip. Example: `./start_ocean.sh --exposeip 192.168.0.1` | ## Docker Building Blocks Barge consists of a set of building blocks that can be combined to form a local test environment. By default all building blocks will be started by the `start_ocean.sh` script. -### Commons - -By default it will start two containers (client & server). If Commons is running, you can open the **Commons Frontend** application in your browser: - -[http://localhost:3000](http://localhost:3000) - -This Building Block can be disabled by setting the `--no-commons` flag. - -| Hostname | External Port | Internal URL | Local URL | Description | -| ---------------- | ------------- | -------------------------- | --------------------- | ---------------------------------------------------------- | -| `commons-client` | `3000` | http://commons-client:3000 | http://localhost:3000 | [Commons Client](https://github.com/oceanprotocol/commons) | -| `commons-server` | `4000` | http://commons-server:4000 | http://locahost:4000 | [Commons Server](https://github.com/oceanprotocol/commons) | - ### Aquarius By default it will start two containers (one for Aquarius and one for its database engine). By default, Barge will use Elasticsearch for its database engine. You can use the `--mongodb` option to use MongoDB instead. @@ -150,68 +104,25 @@ This Building Block can be disabled by setting the `--no-aquarius` flag. | `elasticsearch` | | | | The Elasticsearch used by Aquarius | | `mongodb` | | | | The MongoDB used by Aquarius | -### Brizo +### Provider -By default it will start one container. This Building Block can be disabled by setting the `--no-brizo` flag. +| Hostname | External Port | Internal URL | Local URL | Description | +| ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | +| `provider` | `8030` | http://provider:9000 | http://localhost:8030 | | -| Hostname | External Port | Internal URL | Local URL | Description | -| -------- | ------------- | ----------------- | --------------------- | ----------------------------------------------- | -| `brizo` | `8030` | http://brizo:8030 | http://localhost:8030 | [Brizo](https://github.com/oceanprotocol/brizo) | +### Ganache -### Events Handler +| Hostname | External Port | Internal URL | Local URL | Description | +| ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | +| `ganache` | `8545` | http://ganache:9000 | http://localhost:8545 | | -By default it will start one container. This Building Block can be disabled by setting the `--no-events-handler` flag. +The accounts can be access with this seed phrase: -| Hostname | External Port | Internal URL | Local URL | Description | -| ---------------- | ------------- | ------------ | --------- | ----------------------------------------------------------------- | -| `events-handler` | | | | [Events-handler](https://github.com/oceanprotocol/events-handler) | +``` +taxi music thumb unique chat sand crew more leg another off lamp +``` -### Keeper Node - -Controlled by the `--local-*-node` config switches will start a container `keeper-node` that uses port `8545` to expose an rpc endpoint to the Ethereum Protocol. -You can find a detailed explanation of how to use this in the [script options](#script-options) section of this document. - -| Hostname | External Port | Internal URL | Local URL | Description | -| ------------- | ------------- | ----------------------- | --------------------- | -------------------- | -| `keeper-node` | `8545` | http://keeper-node:8545 | http://localhost:8545 | An Ethereum RPC node | - -This node can be one of the following types (with the default being `spree`): - -| Node | Description | -| --------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `ganache` | Runs a local [ganache-cli](https://github.com/trufflesuite/ganache-cli) node that is not persistent by default. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. | -| `spree` | This is the default. Runs a local node of the Spree Network. See [Spree Network](#spree-network) for details. The contracts from the desired `keeper-contracts` version will be deployed upon launch of this node. | -| `duero` | Runs a local node of the Duero Network and connects to the [Duero Testnet](https://docs.oceanprotocol.com/concepts/testnets/#the-duero-testnet). | -| `nile` | Runs a local node of the Nile Network and connects to the [Nile Testnet](https://docs.oceanprotocol.com/concepts/testnets/#nile-testnet). | -| `pacific` | Runs a local node of the Pacific Network and connects to the [Pacific network](https://docs.oceanprotocol.com/concepts/pacific-network/). | - -### Secret Store - -By default it will start three containers. This Building Block can be disabled by setting the `--no-secret-store` flag. - -| Hostname | External Ports | Internal URL | Local URL | Description | -| --------------------------- | ---------------- | ------------------------------------- | ---------------------- | --------------------------------------------------------------------------------------------- | -| `secret-store` | `12000`, `32771` | http://secret-store:12000 | http://localhost:12000 | An instance of the Ocean Secret Store | -| `secret-store-cors-proxy` | `12001` | http://secret-store-cors-proxy:12001 | http://localhost:12001 | An NGINX proxy to enable CORS on the secret store | -| `secret-store-signing-node` | `9545` | http://secret-store-signing-node:9545 | http://localhost:9545 | A Parity Ethereum node to `sign` messages for the secret store and to `decrypt` and `encrypt` | - -### Faucet - -By default it will start two containers, one for Faucet server and one for its database (MongoDB). This Building Block can be disabled by setting the `--no-faucet` flag. - -| Hostname | External Port | Internal URL | Local URL | Description | -| -------- | ------------- | ------------------ | --------------------- | ------------------------------------------------- | -| `faucet` | `3001` | http://faucet:3001 | http://localhost:3001 | [Faucet](https://github.com/oceanprotocol/faucet) | - -By default the Faucet allows requests every 24hrs. To disable the timespan check you can pass `FAUCET_TIMESPAN=0` as environment variable before starting the script. - -### Agent - -By default it will start one container. This Building Block can be disabled by setting the `--no-agent` flag. - -| Hostname | External Port | Internal URL | Local URL | Description | -| -------- | ------------- | ----------------- | --------------------- | ----------------------------------------------- | -| `agent` | `4040` | http://agent:4040 | http://agent:4040 | [Agent](https://github.com/oceanprotocol/agent) | +Alternatively, you can pass your own mnemonic with `GANACHE_MNEMONIC`. ### Dashboard @@ -224,39 +135,6 @@ This will start a `portainer` dashboard with the following admin credentials and | ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | | `dashboard` | `9000` | http://dashboard:9000 | http://localhost:9000 | [Portainer](https://github.com/portainer/portainer) | -## Spree Network - -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 | Type | Password/Key | Balance | -| -------------------------------------------- | -------- | ---------------------------- | ---------------- | -| `0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e` | key | node0 | 1000000000 Ether | -| `0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0` | key | secret | 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 `PROVIDER_ADDRESS`, `PROVIDER_PASSWORD` and `PROVIDER_KEYFILE` in `start_ocean.sh`. -This account will is used in `brizo` and `events-handler` as the `provider` account which is important for processing the -service agreements flow. The `PROVIDER_KEYFILE` must be placed in the `accounts` folder and must match the ethereum -address from `PROVIDER_ADDRESS`. The `PROVIDER_ADDRESS` is also set in `commons` instance so that published assets get -assigned the correct provider address. - -### 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` - ## Contributing See the page titled "[Ways to Contribute](https://docs.oceanprotocol.com/concepts/contributing/)" in the Ocean Protocol documentation. @@ -264,7 +142,7 @@ See the page titled "[Ways to Contribute](https://docs.oceanprotocol.com/concept ## License ```text -Copyright 2019 Ocean Protocol Foundation +Copyright 2020 Ocean Protocol Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/start_ocean.sh b/start_ocean.sh index a5e8dfb..5941b5a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -1,7 +1,11 @@ #!/usr/bin/env bash -# start_ocean.sh +# # Copyright (c) 2019 Ocean Protocol contributors # SPDX-License-Identifier: Apache-2.0 +# +# Usage: ./start_ocean.sh +# + IP="localhost" optspec=":-:" while getopts "$optspec" optchar; do @@ -17,14 +21,12 @@ done set -e +# Patch $DIR if spaces DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" -export BRIZO_ENV_FILE="${DIR}/brizo.env" - -# Patch $DIR if spaces (BRIZO_ENV_FILE does not need patch) DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" -# Default versions of Aquarius, Brizo, Ocean Contracts and Commons +# Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} @@ -71,10 +73,8 @@ export DDO_CONTRACT_ADDRESS='' if [ ${IP} = "localhost" ]; then export AQUARIUS_URI=http://172.15.0.5:5000 - export BRIZO_URL=http://172.15.0.4:8030 else export AQUARIUS_URI=http://${IP}:5000 - export BRIZO_URL=http://${IP}:8030 fi #export OPERATOR_SERVICE_URL=http://127.0.0.1:8050 @@ -107,26 +107,6 @@ COLOR_C="\033[0;36m" # cyan # reset COLOR_RESET="\033[00m" -function get_acl_address { - # detect ocean contracts version - local version="${1:-latest}" - - # sesarch in the file for the ocean contracts version - line=$(grep "^${version}=" "${DIR}/ACL/${OCEAN_NETWORK_NAME}_addresses.txt") - # set address - address="${line##*=}" - - # if address is still empty - if [ -z "${address}" ]; then - # fetch from latest line - line=$(grep "^latest=" "${DIR}/ACL/${OCEAN_NETWORK_NAME}_addresses.txt") - # set address - address="${line##*=}" - fi - - echo "${address}" -} - function show_banner { local output=$(cat .banner) echo -e "$COLOR_B$output$COLOR_RESET" @@ -177,13 +157,6 @@ while :; do --exposeip) ;; ################################################# - # Log level - ################################################# - --debug) - export BRIZO_LOG_LEVEL="DEBUG" - export EVENTS_HANDLER_LOG_LEVEL="DEBUG" - ;; - ################################################# # Disable color ################################################# --no-ansi) From 99640d206eacfabb509d632753f706d023e59065 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 9 Sep 2020 18:25:24 +0200 Subject: [PATCH 21/51] add ocean-contracts compose file. --- compose-files/aquarius.yml | 4 ++++ compose-files/aquarius_elasticsearch.yml | 3 +++ compose-files/ocean_contracts.yml | 24 ++++++++++++++++++++++++ compose-files/provider.yml | 4 ++++ start_ocean.sh | 21 +++++++++++++++------ 5 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 compose-files/ocean_contracts.yml diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 9338156..d472ec2 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -7,6 +7,8 @@ services: networks: backend: ipv4_address: 172.15.0.5 + depends_on: + - ocean-contracts environment: DB_MODULE: ${DB_MODULE} DB_HOSTNAME: ${DB_HOSTNAME} @@ -18,3 +20,5 @@ services: DB_CA_CERTS: ${DB_CA_CERTS} DB_CLIENT_KEY: ${DB_CLIENT_KEY} DB_CLIENT_CERT: ${DB_CLIENT_CERT} + volumes: + - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml index c29fa11..db07371 100644 --- a/compose-files/aquarius_elasticsearch.yml +++ b/compose-files/aquarius_elasticsearch.yml @@ -19,6 +19,7 @@ services: ipv4_address: 172.15.0.5 depends_on: - elasticsearch + - ocean-contracts environment: DB_MODULE: ${DB_MODULE} DB_HOSTNAME: ${DB_HOSTNAME} @@ -36,3 +37,5 @@ services: EVENTS_RPC: "http://172.15.0.3:8545" EVENTS_ALLOW: "0" RUN_EVENTS_MONITOR: "1" + volumes: + - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/compose-files/ocean_contracts.yml b/compose-files/ocean_contracts.yml new file mode 100644 index 0000000..f30bb6e --- /dev/null +++ b/compose-files/ocean_contracts.yml @@ -0,0 +1,24 @@ +version: '3' +services: + ocean-contracts: + image: oceanprotocol/ocean-contracts:$CONTRACTS_VERSION + networks: + backend: + ipv4_address: 172.15.0.14 + environment: + MNEMONIC: ${GANACHE_MNEMONIC} + OWNER_ROLE_ADDRESS: ${CONTRACTS_OWNER_ROLE_ADDRESS} + DEPLOY_CONTRACTS: ${CONTRACTS_DEPLOY_CONTRACTS} + LOCAL_CONTRACTS: ${CONTRACTS_DEPLOY_CONTRACTS} + REUSE_DATABASE: ${GANACHE_REUSE_DATABASE} + DATABASE_PATH: "/ganache-db" + NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} + CONTRACTS_RPC_HOST: ${NETWORK_RPC_HOST} + CONTRACTS_RPC_PORT: ${NETWORK_RPC_PORT} + CONTRACTS_RPC_URL: ${NETWORK_RPC_URL} + LOCAL_USER_ID: ${LOCAL_USER_ID} + LOCAL_GROUP_ID: ${LOCAL_GROUP_ID} + depends_on: + - ganache + volumes: + - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 1e8beb4..42da1d2 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -7,6 +7,8 @@ services: networks: backend: ipv4_address: 172.15.0.4 + depends_on: + - ocean-contracts environment: ARTIFACTS_PATH: ${OCEAN_ARTIFACTS_FOLDER:-/ocean-provider/artifacts} NETWORK_URL: ${NETWORK_RPC_URL} @@ -21,3 +23,5 @@ services: IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} OCEAN_PROVIDER_TIMEOUT: '9000' OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} + volumes: + - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/start_ocean.sh b/start_ocean.sh index 5941b5a..feb5a6c 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -33,6 +33,10 @@ export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export PROJECT_NAME="ocean" export FORCEPULL="false" +# Export User UID and GID +export LOCAL_USER_ID=$(id -u) +export LOCAL_GROUP_ID=$(id -g) + # Specify the ethereum default RPC container provider if [ ${IP} = "localhost" ]; then @@ -42,9 +46,16 @@ else fi export NETWORK_RPC_PORT="8545" export NETWORK_RPC_URL="http://"${NETWORK_RPC_HOST}:${NETWORK_RPC_PORT} -# Use this seed only on Spree! (Spree is the default.) +# Use this seed on ganache to always create the same wallets export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand crew more leg another off lamp"} +# Ocean contracts +export OCEAN_HOME="${HOME}/.ocean" +export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}" +export CONTRACTS_DEPLOY_CONTRACTS="true" +export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts" +# Specify which ethereum client to run or connect to: development +export CONTRACTS_NETWORK_NAME="ganache" # Default Aquarius parameters: use Elasticsearch export DB_MODULE="elasticsearch" @@ -81,11 +92,6 @@ fi export OPERATOR_SERVICE_URL=https://operator-api.operator.dev-ocean.com -# Export User UID and GID -export LOCAL_USER_ID=$(id -u) -export LOCAL_GROUP_ID=$(id -g) - - #add aquarius to /etc/hosts if [ ${IP} = "localhost" ]; then @@ -150,6 +156,8 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/dashboard.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ganache.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ocean_contracts.yml" + DOCKER_COMPOSE_EXTRA_OPTS="${DOCKER_COMPOSE_EXTRA_OPTS:-}" while :; do @@ -176,6 +184,7 @@ while :; do ;; --no-ganache) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ganache.yml/}" + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/ocean_contracts.yml/}" printf $COLOR_Y'Starting without Ganache...\n\n'$COLOR_RESET ;; --no-aquarius) From 1b5deda9be11e280e2ec3607529f6e12bb895958 Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 11 Sep 2020 08:25:55 +0200 Subject: [PATCH 22/51] fix errors, remove ganache blockTime option. --- compose-files/aquarius.yml | 10 ++++++++++ compose-files/aquarius_elasticsearch.yml | 5 ++++- compose-files/ganache.yml | 2 +- compose-files/ocean_contracts.yml | 10 +++++----- compose-files/provider.yml | 2 +- start_ocean.sh | 9 +++++++-- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index d472ec2..4869679 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -20,5 +20,15 @@ services: DB_CA_CERTS: ${DB_CA_CERTS} DB_CLIENT_KEY: ${DB_CLIENT_KEY} DB_CLIENT_CERT: ${DB_CLIENT_CERT} + LOG_LEVEL: DEBUG + EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8" + ARTIFACTS_PATH: "/ocean-contracts/artifacts" + ADDRESS_FILE: ${OCEAN_ADDRESS_FILE:-/ocean-contracts/artifacts/address.json} + DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS} + NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} + EVENTS_RPC: "http://172.15.0.3:8545" + EVENTS_ALLOW: "0" + RUN_EVENTS_MONITOR: "1" + volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml index db07371..bd46402 100644 --- a/compose-files/aquarius_elasticsearch.yml +++ b/compose-files/aquarius_elasticsearch.yml @@ -33,7 +33,10 @@ services: DB_CLIENT_CERT: ${DB_CLIENT_CERT} LOG_LEVEL: DEBUG EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8" - EVENTS_CONTRACT_ADDRESS: ${DDO_CONTRACT_ADDRESS} + ARTIFACTS_PATH: "/ocean-contracts/artifacts" + ADDRESS_FILE: ${OCEAN_ADDRESS_FILE:-/ocean-contracts/artifacts/address.json} + DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS} + NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} EVENTS_RPC: "http://172.15.0.3:8545" EVENTS_ALLOW: "0" RUN_EVENTS_MONITOR: "1" diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml index 00f6516..ca7f0cf 100644 --- a/compose-files/ganache.yml +++ b/compose-files/ganache.yml @@ -7,4 +7,4 @@ services: networks: backend: ipv4_address: 172.15.0.3 - entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--blockTime", "2", "--db", "./ganache_cache", "--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] \ No newline at end of file + entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache", "--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] diff --git a/compose-files/ocean_contracts.yml b/compose-files/ocean_contracts.yml index f30bb6e..1db5215 100644 --- a/compose-files/ocean_contracts.yml +++ b/compose-files/ocean_contracts.yml @@ -8,14 +8,14 @@ services: environment: MNEMONIC: ${GANACHE_MNEMONIC} OWNER_ROLE_ADDRESS: ${CONTRACTS_OWNER_ROLE_ADDRESS} - DEPLOY_CONTRACTS: ${CONTRACTS_DEPLOY_CONTRACTS} - LOCAL_CONTRACTS: ${CONTRACTS_DEPLOY_CONTRACTS} + DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS} + LOCAL_CONTRACTS: ${DEPLOY_CONTRACTS} REUSE_DATABASE: ${GANACHE_REUSE_DATABASE} DATABASE_PATH: "/ganache-db" NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} - CONTRACTS_RPC_HOST: ${NETWORK_RPC_HOST} - CONTRACTS_RPC_PORT: ${NETWORK_RPC_PORT} - CONTRACTS_RPC_URL: ${NETWORK_RPC_URL} + NETWORK_RPC_HOST: ${NETWORK_RPC_HOST} + NETWORK_RPC_PORT: ${NETWORK_RPC_PORT} + NETWORK_RPC_URL: ${NETWORK_RPC_URL} LOCAL_USER_ID: ${LOCAL_USER_ID} LOCAL_GROUP_ID: ${LOCAL_GROUP_ID} depends_on: diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 42da1d2..e4f3926 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -10,7 +10,7 @@ services: depends_on: - ocean-contracts environment: - ARTIFACTS_PATH: ${OCEAN_ARTIFACTS_FOLDER:-/ocean-provider/artifacts} + ARTIFACTS_PATH: "/ocean-contracts/artifacts" NETWORK_URL: ${NETWORK_RPC_URL} PARITY_URL: ${NETWORK_RPC_URL} PROVIDER_PRIVATE_KEY: ${PROVIDER_PRIVATE_KEY} diff --git a/start_ocean.sh b/start_ocean.sh index feb5a6c..818df3a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -52,7 +52,7 @@ export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand c # Ocean contracts export OCEAN_HOME="${HOME}/.ocean" export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}" -export CONTRACTS_DEPLOY_CONTRACTS="true" +export DEPLOY_CONTRACTS="true" export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts" # Specify which ethereum client to run or connect to: development export CONTRACTS_NETWORK_NAME="ganache" @@ -80,7 +80,6 @@ export PROVIDER_ENCRYPTED_KEY='' export PROVIDER_ADDRESS='' export PROVIDER_PASSWORD='' export PROVIDER_KEYFILE="/accounts/provider.json" -export DDO_CONTRACT_ADDRESS='' if [ ${IP} = "localhost" ]; then export AQUARIUS_URI=http://172.15.0.5:5000 @@ -147,6 +146,11 @@ function check_max_map_count { fi } +function clean_local_contracts { + rm -f "${OCEAN_ARTIFACTS_FOLDER}/ready" + rm -f "${OCEAN_ARTIFACTS_FOLDER}/*.json" +} + check_if_owned_by_root show_banner @@ -227,6 +231,7 @@ while :; do *) [ ${CHECK_ELASTIC_VM_COUNT} = "true" ] && check_max_map_count printf $COLOR_Y'Starting Ocean V3...\n\n'$COLOR_RESET + [ ${DEPLOY_CONTRACTS} = "true" ] && clean_local_contracts [ ${FORCEPULL} = "true" ] && eval docker-compose "$DOCKER_COMPOSE_EXTRA_OPTS" --project-name=$PROJECT_NAME "$COMPOSE_FILES" pull eval docker-compose "$DOCKER_COMPOSE_EXTRA_OPTS" --project-name=$PROJECT_NAME "$COMPOSE_FILES" up --remove-orphans break From b4bd7bd2f23fa136fcfbcf22500708ed7f746b68 Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 11 Sep 2020 09:46:26 +0200 Subject: [PATCH 23/51] use ocean-contracts:test docker image until it is merged to master. --- compose-files/ocean_contracts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/ocean_contracts.yml b/compose-files/ocean_contracts.yml index 1db5215..e886b67 100644 --- a/compose-files/ocean_contracts.yml +++ b/compose-files/ocean_contracts.yml @@ -1,7 +1,7 @@ version: '3' services: ocean-contracts: - image: oceanprotocol/ocean-contracts:$CONTRACTS_VERSION + image: oceanprotocol/ocean-contracts:${CONTRACTS_VERSION:-test} networks: backend: ipv4_address: 172.15.0.14 From da93e108418b86c49aa78be9b4b785100122802d Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 11 Sep 2020 10:00:59 +0200 Subject: [PATCH 24/51] set contracts version in start_ocean --- compose-files/ocean_contracts.yml | 2 +- start_ocean.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-files/ocean_contracts.yml b/compose-files/ocean_contracts.yml index e886b67..1db5215 100644 --- a/compose-files/ocean_contracts.yml +++ b/compose-files/ocean_contracts.yml @@ -1,7 +1,7 @@ version: '3' services: ocean-contracts: - image: oceanprotocol/ocean-contracts:${CONTRACTS_VERSION:-test} + image: oceanprotocol/ocean-contracts:$CONTRACTS_VERSION networks: backend: ipv4_address: 172.15.0.14 diff --git a/start_ocean.sh b/start_ocean.sh index 818df3a..216829b 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} - +export CONTRACTS_VERSION=${CONTRACTS_VERSION-test} export PROJECT_NAME="ocean" export FORCEPULL="false" From 7ee85c95031794a17690851e30b6560155608e44 Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 11 Sep 2020 11:19:41 +0200 Subject: [PATCH 25/51] Use aquarius `latest` tag. --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 216829b..f000e33 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -27,7 +27,7 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-latest} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export CONTRACTS_VERSION=${CONTRACTS_VERSION-test} export PROJECT_NAME="ocean" From b61407d9c5e03bbedf12e610042c58be0eb388a3 Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 11 Sep 2020 11:31:47 +0200 Subject: [PATCH 26/51] Update readme file, fix error in setting default ocean-contracts version. --- README.md | 19 +++++++++++++++---- start_ocean.sh | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3756919..9b30571 100644 --- a/README.md +++ b/README.md @@ -58,14 +58,15 @@ The startup script comes with a set of options for customizing various things. The default versions are always a combination of component versions which are considered stable. -| Aquarius | Provider | Ganache | -| -------- | -------- | -------- | -| `vx.x.x` | `vx.x.x` | `latest` | +| Aquarius | Provider | Ganache | ocean-contracts | +| -------- | -------- | -------- | --------------- | +| `vx.x.x` | `vx.x.x` | `latest` | `test` You can override the Docker image tag used for a particular component by setting its associated environment variable before calling `start_ocean.sh`: - `AQUARIUS_VERSION` - `PROVIDER_VERSION` +- `CONTRACTS_VERSION` For example: @@ -116,7 +117,17 @@ This Building Block can be disabled by setting the `--no-aquarius` flag. | ----------- | ------------- | --------------------- | --------------------- | --------------------------------------------------- | | `ganache` | `8545` | http://ganache:9000 | http://localhost:8545 | | -The accounts can be access with this seed phrase: +### ocean-contracts +* Deploy all smart contracts from the ocean-contracts repo +* Export artifacts files (.json) to default shared folder between all containers +* Create address file (address.json) that has the address of each deployed +smart contract that is required by the ocean library. This file is saved to the same folder with the artifacts files + +| Hostname | External Port | Internal URL | Local URL | Description | +| ------------------- | ------------- | --------------------- | --------------------- | ------------------------------------------- | +| `ocean-contracts` | | | | | + +The accounts can be accessed with this seed phrase: ``` taxi music thumb unique chat sand crew more leg another off lamp diff --git a/start_ocean.sh b/start_ocean.sh index f000e33..2225af6 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-latest} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} -export CONTRACTS_VERSION=${CONTRACTS_VERSION-test} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-test} export PROJECT_NAME="ocean" export FORCEPULL="false" From fc406853044b0ef217a09bcb31f9272c016bb7fa Mon Sep 17 00:00:00 2001 From: ssallam Date: Fri, 11 Sep 2020 18:05:39 +0200 Subject: [PATCH 27/51] update aquarius default version. --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 2225af6..b3ad207 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -27,7 +27,7 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-latest} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-decentralized} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-test} export PROJECT_NAME="ocean" From 5215ee5f0e6ce6d1c7047ca9bb11d4075b91b165 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 15 Sep 2020 01:07:35 -0700 Subject: [PATCH 28/51] small fixes --- compose-files/provider.yml | 1 + start_ocean.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index e4f3926..3a88d91 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -13,6 +13,7 @@ services: ARTIFACTS_PATH: "/ocean-contracts/artifacts" NETWORK_URL: ${NETWORK_RPC_URL} PARITY_URL: ${NETWORK_RPC_URL} + PROVIDER_KEY: ${PROVIDER_PRIVATE_KEY} PROVIDER_PRIVATE_KEY: ${PROVIDER_PRIVATE_KEY} PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} diff --git a/start_ocean.sh b/start_ocean.sh index b3ad207..ac37d25 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -54,6 +54,8 @@ export OCEAN_HOME="${HOME}/.ocean" export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}" export DEPLOY_CONTRACTS="true" export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts" +export ADDRESS_FILE="${OCEAN_ARTIFACTS_FOLDER}/address.json" +echo "export ADDRESS_FILE=${ADDRESS_FILE}" # Specify which ethereum client to run or connect to: development export CONTRACTS_NETWORK_NAME="ganache" @@ -75,11 +77,11 @@ CHECK_ELASTIC_VM_COUNT=true export PROVIDER_LOG_LEVEL=INFO export PROVIDER_WORKERS=1 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com -export PROVIDER_PRIVATE_KEY=0x9bf5d7e4978ed5206f760e6daded34d657572bd49fa5b3fe885679329fb16b16 +export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215 export PROVIDER_ENCRYPTED_KEY='' export PROVIDER_ADDRESS='' export PROVIDER_PASSWORD='' -export PROVIDER_KEYFILE="/accounts/provider.json" +#export PROVIDER_KEYFILE="/accounts/provider.json" if [ ${IP} = "localhost" ]; then export AQUARIUS_URI=http://172.15.0.5:5000 From cf8a149f8377cefc0ef8a8f69fba47c6a7f659cd Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 16 Sep 2020 17:59:44 +0200 Subject: [PATCH 29/51] lock Aquarius & Provider versions --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 5941b5a..8efe65a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -27,8 +27,8 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.0.0} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.1.0} export PROJECT_NAME="ocean" export FORCEPULL="false" From 5e164c28cebe1af5c4ca5f467dd0db0c9448e75a Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 17 Sep 2020 07:14:40 +0300 Subject: [PATCH 30/51] Update start_ocean.sh aquarius v2.0 is used only with feature/contracts branch --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 8efe65a..d9c827c 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -27,7 +27,7 @@ DIR="${DIR/ /\\ }" COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.0.0} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.1.0} export PROJECT_NAME="ocean" From f35b318ee03204c8b14161e26973c98de1cab01b Mon Sep 17 00:00:00 2001 From: ssallam Date: Thu, 17 Sep 2020 13:36:13 +0200 Subject: [PATCH 31/51] use provider v0.3.0 --- start_ocean.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index ac37d25..e5743df 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,7 +28,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-decentralized} -export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-test} export PROJECT_NAME="ocean" export FORCEPULL="false" @@ -78,10 +78,6 @@ export PROVIDER_LOG_LEVEL=INFO export PROVIDER_WORKERS=1 export PROVIDER_IPFS_GATEWAY=https://ipfs.oceanprotocol.com export PROVIDER_PRIVATE_KEY=0xfd5c1ccea015b6d663618850824154a3b3fb2882c46cefb05b9a93fea8c3d215 -export PROVIDER_ENCRYPTED_KEY='' -export PROVIDER_ADDRESS='' -export PROVIDER_PASSWORD='' -#export PROVIDER_KEYFILE="/accounts/provider.json" if [ ${IP} = "localhost" ]; then export AQUARIUS_URI=http://172.15.0.5:5000 From 0c51bcc2dca4ff6e556bf99434fdee2b5c25e0e3 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 17 Sep 2020 22:46:39 +0300 Subject: [PATCH 32/51] Update start_ocean.sh --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 2ca757b..259e5a3 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,8 +28,8 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:latest} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} +export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-test} export PROJECT_NAME="ocean" export FORCEPULL="false" From 05ec7c4a4cdc30c87e73a5ea2c7e6e4e2d78a6d5 Mon Sep 17 00:00:00 2001 From: ssallam Date: Tue, 22 Sep 2020 14:50:46 +0200 Subject: [PATCH 33/51] set aquarius url for the provider container. --- compose-files/provider.yml | 1 + start_ocean.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compose-files/provider.yml b/compose-files/provider.yml index 3a88d91..d60b7fc 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -24,5 +24,6 @@ services: IPFS_GATEWAY: ${PROVIDER_IPFS_GATEWAY} OCEAN_PROVIDER_TIMEOUT: '9000' OPERATOR_SERVICE_URL: ${OPERATOR_SERVICE_URL} + AQUARIUS_URL: ${AQUARIUS_URL:-http://172.15.0.5:5000} volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/start_ocean.sh b/start_ocean.sh index 259e5a3..50b447f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,9 +28,9 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-test} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-decentralized} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.4.3} export PROJECT_NAME="ocean" export FORCEPULL="false" From 4c354e36674d53c138707930204b779786ee819b Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 23 Sep 2020 08:06:22 +0300 Subject: [PATCH 34/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 259e5a3..517290e 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-test} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-latest} export PROJECT_NAME="ocean" export FORCEPULL="false" From 15ad93f8876bb1e8f9f39547424f1c6ba8ee1b4b Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 23 Sep 2020 13:49:36 +0200 Subject: [PATCH 35/51] update default versions --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 50b447f..53b6d22 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,9 +28,9 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-decentralized} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.4.3} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.4.4} export PROJECT_NAME="ocean" export FORCEPULL="false" From 0519b8d8de2d86ad095b6125ac8e9b420d58702d Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Thu, 24 Sep 2020 22:38:39 +0200 Subject: [PATCH 36/51] docs update --- README.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9b30571..45b3b3c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

barge

-> 🐳 Docker Compose files for the full Ocean Protocol stack. +> 🐳 Docker Compose files for the full Ocean Protocol stack running locally for development. --- @@ -15,6 +15,7 @@ - [Aquarius](#aquarius) - [Provider](#provider) - [Ganache](#ganache) + - [ocean-contracts](#ocean-contracts) - [Dashboard](#dashboard) - [Contributing](#contributing) - [License](#license) @@ -40,15 +41,15 @@ cd barge ./start_ocean.sh ``` -That will run the current default versions of Aquarius, Provider, Ganache. +This will run the current default versions of [Aquarius](https://github.com/oceanprotocol/aquarius), [Provider](https://github.com/oceanprotocol/provider-py), and [Ganache](https://github.com/trufflesuite/ganache-cli) with [our contracts](https://github.com/oceanprotocol/ocean-contracts) deployed to it. Welcome to Ocean Protocol -It's overkill, but to be _sure_ that you use exactly the Docker images and volumes you want, you can prune all the Docker things in your system first: +> It's overkill, but to be _sure_ that you use exactly the Docker images and volumes you want, you can prune all the Docker things in your system first: -```bash -docker system prune --all --volumes -``` +> ```bash +> docker system prune --all --volumes +> ``` ## Options @@ -118,14 +119,10 @@ This Building Block can be disabled by setting the `--no-aquarius` flag. | `ganache` | `8545` | http://ganache:9000 | http://localhost:8545 | | ### ocean-contracts -* Deploy all smart contracts from the ocean-contracts repo + +* Deploy all smart contracts from the `ocean-contracts` repo * Export artifacts files (.json) to default shared folder between all containers -* Create address file (address.json) that has the address of each deployed -smart contract that is required by the ocean library. This file is saved to the same folder with the artifacts files - -| Hostname | External Port | Internal URL | Local URL | Description | -| ------------------- | ------------- | --------------------- | --------------------- | ------------------------------------------- | -| `ocean-contracts` | | | | | +* Create address file (address.json) that has the address of each deployed smart contract that is required by the ocean library. This file is saved to the same folder with the artifacts files The accounts can be accessed with this seed phrase: From ce67c07d882b64b09ad2e33ec54511665f05609c Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 2 Oct 2020 10:36:24 +0300 Subject: [PATCH 37/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 53b6d22..a4b3e25 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.4.4} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.1} export PROJECT_NAME="ocean" export FORCEPULL="false" From 9929cdf44bb43c0431bd312f36e1a1c754349591 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 2 Oct 2020 13:30:06 +0300 Subject: [PATCH 38/51] Update ganache.yml --- compose-files/ganache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml index ca7f0cf..17f5196 100644 --- a/compose-files/ganache.yml +++ b/compose-files/ganache.yml @@ -7,4 +7,4 @@ services: networks: backend: ipv4_address: 172.15.0.3 - entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache", "--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] + entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache", "--chainId","0x2324","--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] From adf74994ecc5ee186a41c07f039f16f38fa4fcc7 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 2 Oct 2020 13:36:57 +0300 Subject: [PATCH 39/51] Update ganache.yml --- compose-files/ganache.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/ganache.yml b/compose-files/ganache.yml index 17f5196..4d90d14 100644 --- a/compose-files/ganache.yml +++ b/compose-files/ganache.yml @@ -7,4 +7,4 @@ services: networks: backend: ipv4_address: 172.15.0.3 - entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache", "--chainId","0x2324","--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] + entrypoint: ["node", "/app/ganache-core.docker.cli.js", "--db", "./ganache_cache","--networkId","0x2324","--gasLimit","10000000000","--gasPrice","1","---hardfork","istanbul","--mnemonic","${GANACHE_MNEMONIC}"] From 57160764186dbd69fab5a4ec1c4b373af6657ab6 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Fri, 2 Oct 2020 16:29:44 +0300 Subject: [PATCH 40/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index a4b3e25..3d0ce6a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.1} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.3} export PROJECT_NAME="ocean" export FORCEPULL="false" From 44ebd4f1125e22af2199e715fba8356a4ba0e2d0 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Mon, 12 Oct 2020 16:47:51 +0300 Subject: [PATCH 41/51] Update start_ocean.sh --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 3d0ce6a..7f2362f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.3} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.5} export PROJECT_NAME="ocean" export FORCEPULL="false" @@ -58,7 +58,7 @@ export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts" export ADDRESS_FILE="${OCEAN_ARTIFACTS_FOLDER}/address.json" echo "export ADDRESS_FILE=${ADDRESS_FILE}" # Specify which ethereum client to run or connect to: development -export CONTRACTS_NETWORK_NAME="ganache" +export CONTRACTS_NETWORK_NAME="development" # Default Aquarius parameters: use Elasticsearch export DB_MODULE="elasticsearch" From 6bb045684aea26b66345bb678ac0ca56b583be2a Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Mon, 12 Oct 2020 17:36:53 +0300 Subject: [PATCH 42/51] Update aquarius_elasticsearch.yml --- compose-files/aquarius_elasticsearch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml index bd46402..705dd74 100644 --- a/compose-files/aquarius_elasticsearch.yml +++ b/compose-files/aquarius_elasticsearch.yml @@ -34,7 +34,7 @@ services: LOG_LEVEL: DEBUG EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8" ARTIFACTS_PATH: "/ocean-contracts/artifacts" - ADDRESS_FILE: ${OCEAN_ADDRESS_FILE:-/ocean-contracts/artifacts/address.json} + ADDRESS_FILE: "/ocean-contracts/artifacts/address.json" DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS} NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} EVENTS_RPC: "http://172.15.0.3:8545" From 7c2174270ff7f729a3f654b8d88cf4282dc83567 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Mon, 12 Oct 2020 19:16:34 +0300 Subject: [PATCH 43/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 7f2362f..731c547 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -53,7 +53,7 @@ export GANACHE_MNEMONIC=${GANACHE_MNEMONIC:-"taxi music thumb unique chat sand c # Ocean contracts export OCEAN_HOME="${HOME}/.ocean" export CONTRACTS_OWNER_ROLE_ADDRESS="${CONTRACTS_OWNER_ROLE_ADDRESS}" -export DEPLOY_CONTRACTS="true" +export DEPLOY_CONTRACTS=true export OCEAN_ARTIFACTS_FOLDER="${OCEAN_HOME}/ocean-contracts/artifacts" export ADDRESS_FILE="${OCEAN_ARTIFACTS_FOLDER}/address.json" echo "export ADDRESS_FILE=${ADDRESS_FILE}" From cb45cf7128823b365644ed4df8548d77af06673c Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 13 Oct 2020 10:37:49 +0200 Subject: [PATCH 44/51] remove unused aquarius compose files --- compose-files/aquarius.yml | 18 +++++++--- compose-files/aquarius_elasticsearch.yml | 44 ------------------------ compose-files/aquarius_mongodb.yml | 21 ----------- start_ocean.sh | 2 +- 4 files changed, 15 insertions(+), 70 deletions(-) delete mode 100644 compose-files/aquarius_elasticsearch.yml delete mode 100644 compose-files/aquarius_mongodb.yml diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 4869679..705dd74 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -1,13 +1,24 @@ version: '3' services: + elasticsearch: + image: elasticsearch:6.8.3 + networks: + backend: + ipv4_address: 172.15.0.6 + environment: + ES_JAVA_OPTS: "-Xms512m -Xmx512m" + MAX_MAP_COUNT: "64000" + discovery.type: "single-node" + aquarius: - image: oceanprotocol/aquarius:$AQUARIUS_VERSION + image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} ports: - - 5000:5000 + - 5000:5000 networks: backend: ipv4_address: 172.15.0.5 depends_on: + - elasticsearch - ocean-contracts environment: DB_MODULE: ${DB_MODULE} @@ -23,12 +34,11 @@ services: LOG_LEVEL: DEBUG EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8" ARTIFACTS_PATH: "/ocean-contracts/artifacts" - ADDRESS_FILE: ${OCEAN_ADDRESS_FILE:-/ocean-contracts/artifacts/address.json} + ADDRESS_FILE: "/ocean-contracts/artifacts/address.json" DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS} NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} EVENTS_RPC: "http://172.15.0.3:8545" EVENTS_ALLOW: "0" RUN_EVENTS_MONITOR: "1" - volumes: - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/compose-files/aquarius_elasticsearch.yml b/compose-files/aquarius_elasticsearch.yml deleted file mode 100644 index 705dd74..0000000 --- a/compose-files/aquarius_elasticsearch.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: '3' -services: - elasticsearch: - image: elasticsearch:6.8.3 - networks: - backend: - ipv4_address: 172.15.0.6 - environment: - ES_JAVA_OPTS: "-Xms512m -Xmx512m" - MAX_MAP_COUNT: "64000" - discovery.type: "single-node" - - aquarius: - image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} - ports: - - 5000:5000 - networks: - backend: - ipv4_address: 172.15.0.5 - depends_on: - - elasticsearch - - ocean-contracts - environment: - DB_MODULE: ${DB_MODULE} - DB_HOSTNAME: ${DB_HOSTNAME} - DB_PORT: ${DB_PORT} - DB_USERNAME: ${DB_USERNAME} - DB_PASSWORD: ${DB_PASSWORD} - DB_SSL: ${DB_SSL} - DB_VERIFY_CERTS: ${DB_VERIFY_CERTS} - DB_CA_CERTS: ${DB_CA_CERTS} - DB_CLIENT_KEY: ${DB_CLIENT_KEY} - DB_CLIENT_CERT: ${DB_CLIENT_CERT} - LOG_LEVEL: DEBUG - EVENTS_ECIES_PRIVATE_KEY: "0x5d75837394b078ce97bc289fa8d75e21000573520bfa7784a9d28ccaae602bf8" - ARTIFACTS_PATH: "/ocean-contracts/artifacts" - ADDRESS_FILE: "/ocean-contracts/artifacts/address.json" - DEPLOY_CONTRACTS: ${DEPLOY_CONTRACTS} - NETWORK_NAME: ${CONTRACTS_NETWORK_NAME} - EVENTS_RPC: "http://172.15.0.3:8545" - EVENTS_ALLOW: "0" - RUN_EVENTS_MONITOR: "1" - volumes: - - ${OCEAN_ARTIFACTS_FOLDER}:/ocean-contracts/artifacts/ diff --git a/compose-files/aquarius_mongodb.yml b/compose-files/aquarius_mongodb.yml deleted file mode 100644 index 08c24bb..0000000 --- a/compose-files/aquarius_mongodb.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: '3' -services: - mongodb: - image: mongo:3.6 - command: mongod - networks: - backend: - ipv4_address: 172.15.0.6 - aquarius: - image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} - ports: - - 5000:5000 - networks: - backend: - ipv4_address: 172.15.0.5 - depends_on: - - mongodb - environment: - DB_MODULE: ${DB_MODULE} - DB_HOSTNAME: ${DB_HOSTNAME} - DB_PORT: ${DB_PORT} diff --git a/start_ocean.sh b/start_ocean.sh index 731c547..1fb3db5 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -156,7 +156,7 @@ show_banner COMPOSE_FILES="" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/dashboard.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/provider.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ganache.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/ocean_contracts.yml" From 52d92797bf03087ab5035da004c1f97a2dd8ecd9 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 13 Oct 2020 10:39:09 +0200 Subject: [PATCH 45/51] update docs --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 45b3b3c..075f6f1 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,6 @@ export AQUARIUS_VERSION=v2.0.0 | `--no-provider` | Start up Ocean without the `provider` Building Block. | | `--no-ganache` | Start up Ocean without the `ganache` Building Block. | | `--no-dashboard` | Start up Ocean without the `dashboard` Building Block. | -| `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. | | `--force-pull` | Force pulling the latest revision of the used Docker images. | | `--purge` | Removes the Docker containers, volumes, artifact folder and networks used by the script. | | `--exposeip` | Binds the components to that specific ip. Example: `./start_ocean.sh --exposeip 192.168.0.1` | @@ -96,7 +95,7 @@ Barge consists of a set of building blocks that can be combined to form a local ### Aquarius -By default it will start two containers (one for Aquarius and one for its database engine). By default, Barge will use Elasticsearch for its database engine. You can use the `--mongodb` option to use MongoDB instead. +By default it will start two containers (one for Aquarius and one for its database engine). By default, Barge will use Elasticsearch for its database engine. This Building Block can be disabled by setting the `--no-aquarius` flag. @@ -104,7 +103,6 @@ This Building Block can be disabled by setting the `--no-aquarius` flag. | --------------- | ------------- | -------------------- | --------------------- | ----------------------------------------------------- | | `aquarius` | `5000` | http://aquarius:5000 | http://localhost:5000 | [Aquarius](https://github.com/oceanprotocol/aquarius) | | `elasticsearch` | | | | The Elasticsearch used by Aquarius | -| `mongodb` | | | | The MongoDB used by Aquarius | ### Provider From ccc685f06d0fad2204ec00a612a80fe51553918f Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 13 Oct 2020 10:43:29 +0200 Subject: [PATCH 46/51] remove mongodb option from script --- start_ocean.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 1fb3db5..d3eee4f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -199,18 +199,6 @@ while :; do printf $COLOR_Y'Starting without Dashboard ...\n\n'$COLOR_RESET ;; ################################################# - # MongoDB - ################################################# - --mongodb) - COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_mongodb.yml" - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_elasticsearch.yml/}" - CHECK_ELASTIC_VM_COUNT=false - export DB_MODULE="mongodb" - export DB_HOSTNAME="mongodb" - export DB_PORT="27017" - printf $COLOR_Y'Starting with MongoDB...\n\n'$COLOR_RESET - ;; - ################################################# # Cleaning switches ################################################# --purge) From 444fb56ff4ea7b58225993b9b89af0ee600b0ffa Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Tue, 13 Oct 2020 10:47:00 +0200 Subject: [PATCH 47/51] cleanup --- .gitignore | 3 --- start_ocean.sh | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index efe2b63..2a09498 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,6 @@ ganache-db/ # Emacs *~ -# mutable secret store config (Issue #126) -networks/secret-store/config/config.toml - # Mac OS Filesystem artifacts .DS_Store **/.DS_Store diff --git a/start_ocean.sh b/start_ocean.sh index d3eee4f..783351f 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (c) 2019 Ocean Protocol contributors +# Copyright (c) 2020 Ocean Protocol contributors # SPDX-License-Identifier: Apache-2.0 # # Usage: ./start_ocean.sh @@ -90,7 +90,8 @@ fi export OPERATOR_SERVICE_URL=https://operator-api.operator.dev-ocean.com -#add aquarius to /etc/hosts +# Add aquarius to /etc/hosts +# Workaround mainly for macOS if [ ${IP} = "localhost" ]; then if grep -q "aquarius" /etc/hosts; then @@ -191,7 +192,7 @@ while :; do printf $COLOR_Y'Starting without Ganache...\n\n'$COLOR_RESET ;; --no-aquarius) - COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius_elasticsearch.yml/}" + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/aquarius.yml/}" printf $COLOR_Y'Starting without Aquarius...\n\n'$COLOR_RESET ;; --no-dashboard) From 10e3ebeaaea558794f3ede594928e1143f8f798b Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Wed, 14 Oct 2020 21:09:31 +0300 Subject: [PATCH 48/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 783351f..9cea66c 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -29,7 +29,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.3.0} +export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.5} export PROJECT_NAME="ocean" export FORCEPULL="false" From c48be04c37ff1c4dbcfdce6fff38912bd9db1b77 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 21 Oct 2020 16:54:14 +0200 Subject: [PATCH 49/51] add option to allow skipping contract deployment. --- start_ocean.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/start_ocean.sh b/start_ocean.sh index 9cea66c..4b8b215 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -199,6 +199,10 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/dashboard.yml/}" printf $COLOR_Y'Starting without Dashboard ...\n\n'$COLOR_RESET ;; + --skip-deploy) + export DEPLOY_CONTRACTS=false + printf $COLOR_Y'Ocean contracts will not be deployed, the last deployment (if any) will be intact ...\n\n'$COLOR_RESET + ;; ################################################# # Cleaning switches ################################################# From ea9699a24bb169cd93189a01ffc7d5da65663587 Mon Sep 17 00:00:00 2001 From: Alex Coseru Date: Thu, 22 Oct 2020 15:40:07 +0300 Subject: [PATCH 50/51] Update start_ocean.sh --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 4b8b215..91be4ee 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -30,7 +30,7 @@ COMPOSE_DIR="${DIR}/compose-files" export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.5} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.7} export PROJECT_NAME="ocean" export FORCEPULL="false" From f0041b0fdee6a902e40c50caaabe8b4f082a3ba5 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 27 Oct 2020 04:13:59 -0700 Subject: [PATCH 51/51] update versions --- README.md | 2 +- compose-files/aquarius.yml | 2 +- compose-files/ocean_contracts.yml | 2 +- compose-files/provider.yml | 2 +- start_ocean.sh | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 075f6f1..e2bec14 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The default versions are always a combination of component versions which are co | Aquarius | Provider | Ganache | ocean-contracts | | -------- | -------- | -------- | --------------- | -| `vx.x.x` | `vx.x.x` | `latest` | `test` +| `v2.1.0` | `v0.4.0` | `latest` | `V0.5.7` You can override the Docker image tag used for a particular component by setting its associated environment variable before calling `start_ocean.sh`: diff --git a/compose-files/aquarius.yml b/compose-files/aquarius.yml index 705dd74..36089b1 100644 --- a/compose-files/aquarius.yml +++ b/compose-files/aquarius.yml @@ -11,7 +11,7 @@ services: discovery.type: "single-node" aquarius: - image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-stable} + image: oceanprotocol/aquarius:${AQUARIUS_VERSION:-latest} ports: - 5000:5000 networks: diff --git a/compose-files/ocean_contracts.yml b/compose-files/ocean_contracts.yml index 1db5215..52e8580 100644 --- a/compose-files/ocean_contracts.yml +++ b/compose-files/ocean_contracts.yml @@ -1,7 +1,7 @@ version: '3' services: ocean-contracts: - image: oceanprotocol/ocean-contracts:$CONTRACTS_VERSION + image: oceanprotocol/ocean-contracts:${CONTRACTS_VERSION:-latest} networks: backend: ipv4_address: 172.15.0.14 diff --git a/compose-files/provider.yml b/compose-files/provider.yml index d60b7fc..61445f5 100644 --- a/compose-files/provider.yml +++ b/compose-files/provider.yml @@ -1,7 +1,7 @@ version: '3' services: provider: - image: oceanprotocol/provider-py:$PROVIDER_VERSION + image: oceanprotocol/provider-py:${PROVIDER_VERSION:-latest} ports: - 8030:8030 networks: diff --git a/start_ocean.sh b/start_ocean.sh index 9cea66c..bbb7de4 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -28,9 +28,9 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Provider -export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v3} -export PROVIDER_VERSION=${PROVIDER_VERSION:-latest} -export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.5} +export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v2.1.0} +export PROVIDER_VERSION=${PROVIDER_VERSION:-v0.4.0} +export CONTRACTS_VERSION=${CONTRACTS_VERSION:-v0.5.7} export PROJECT_NAME="ocean" export FORCEPULL="false"