From 0785ba7028c5c503ea5f1b23a2169863f2c93907 Mon Sep 17 00:00:00 2001 From: ssallam Date: Mon, 26 Aug 2019 13:19:17 +0200 Subject: [PATCH 01/12] Add support for new brizo version and stand-alone events monitor. --- start_ocean.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/start_ocean.sh b/start_ocean.sh index 98cf4eb..48ff7c5 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -15,6 +15,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14} +export EVENTS_MONITOR_VERSION=$(EVENTS_MONITOR_VERSION:-v0.1.0) export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.0} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} @@ -145,6 +146,7 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/events_monitor.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/faucet.yml" @@ -165,6 +167,7 @@ while :; do --latest) export AQUARIUS_VERSION="latest" export BRIZO_VERSION="latest" + export EVENTS_MONITOR_VERSION="latest" export KEEPER_VERSION="latest" # TODO: Change label on Docker to refer `latest` to `master` export PLEUSTON_VERSION="master" @@ -182,6 +185,8 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}" printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET ;; + --no-events-monitor) + --no-brizo) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/brizo.yml/}" printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET From d64c7948801ea14ccff6cb8ef68998a7df561731 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 28 Aug 2019 14:50:58 +0200 Subject: [PATCH 02/12] Update brizo and events_handler docker-compose files --- compose-files/brizo.yml | 2 ++ compose-files/events_handler.yml | 20 ++++++++++++++++++++ start_ocean.sh | 12 +++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 compose-files/events_handler.yml diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index 814de95..fb4ec24 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -14,6 +14,8 @@ services: environment: KEEPER_URL: ${KEEPER_RPC_URL} PARITY_URL: ${KEEPER_RPC_URL} + PARITY_KEYFILE: "/parity-data/keys/validator0.json" LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro + - ../networks/spree/authorities/:/parity-data/keys diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml new file mode 100644 index 0000000..94e8df8 --- /dev/null +++ b/compose-files/events_handler.yml @@ -0,0 +1,20 @@ +version: '3' +services: + events-handler: + image: oceanprotocol/ocean-events-handler:v0.1.0 + networks: + backend: + ipv4_address: 172.15.0.22 + depends_on: + - keeper-node + environment: + KEEPER_URL: ${KEEPER_RPC_URL} + PARITY_URL: ${KEEPER_RPC_URL} + SECRET_STORE_URL: "http://secret-store:12001" + PARITY_ADDRESS: "0x00bd138abd70e2f00903268f3db08f2d25677c9e" + PARITY_PASSWORD: "node0" + PARITY_KEYFILE: "/parity-data/keys/validator0.json" + LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} + volumes: + - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro + - ../networks/spree/authorities/:/parity-data/keys diff --git a/start_ocean.sh b/start_ocean.sh index 48ff7c5..b8d1ed8 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -15,7 +15,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14} -export EVENTS_MONITOR_VERSION=$(EVENTS_MONITOR_VERSION:-v0.1.0) +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:v0.1.0} export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.0} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} @@ -146,7 +146,7 @@ COMPOSE_FILES+=" -f ${COMPOSE_DIR}/network_volumes.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/pleuston.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/aquarius_elasticsearch.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/brizo.yml" -COMPOSE_FILES+=" -f ${COMPOSE_DIR}/events_monitor.yml" +COMPOSE_FILES+=" -f ${COMPOSE_DIR}/events_handler.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/secret_store.yml" COMPOSE_FILES+=" -f ${COMPOSE_DIR}/faucet.yml" @@ -167,7 +167,7 @@ while :; do --latest) export AQUARIUS_VERSION="latest" export BRIZO_VERSION="latest" - export EVENTS_MONITOR_VERSION="latest" + export EVENTS_HANDLER_VERSION="latest" export KEEPER_VERSION="latest" # TODO: Change label on Docker to refer `latest` to `master` export PLEUSTON_VERSION="master" @@ -185,8 +185,10 @@ while :; do COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}" printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET ;; - --no-events-monitor) - + --no-events-handler) + COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/events_handler.yml/}" + printf $COLOR_Y'Starting without EventsHandler...\n\n'$COLOR_RESET + ;; --no-brizo) COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/brizo.yml/}" printf $COLOR_Y'Starting without Brizo...\n\n'$COLOR_RESET From 6ce139e80150b27b745752226358d3fef3408ec1 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 28 Aug 2019 15:10:30 +0200 Subject: [PATCH 03/12] Update compose files to match new style in `feature/optimize` branch and introduce a new env var for setting log level in both brizo and ocean_events_handler --- compose-files/brizo.yml | 3 ++- compose-files/events_handler.yml | 11 ++++++----- start_ocean.sh | 8 ++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index 55cbf5d..3f927a2 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -19,7 +19,8 @@ services: SECRET_STORE_URL: ${SECRET_STORE_URL} PARITY_ADDRESS: ${PUBLISHER_ADDRESS} PARITY_PASSWORD: ${PUBLISHER_PASSWORD} - PARITY_KEYFILE: "/parity-data/keys/validator0.json" + PARITY_KEYFILE: ${PUBLISHER_KEYFILE} + LOG_LEVEL: ${BRIZO_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ../networks/spree/authorities/:/parity-data/keys diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml index 94e8df8..c157ff2 100644 --- a/compose-files/events_handler.yml +++ b/compose-files/events_handler.yml @@ -9,12 +9,13 @@ services: - keeper-node environment: KEEPER_URL: ${KEEPER_RPC_URL} - PARITY_URL: ${KEEPER_RPC_URL} - SECRET_STORE_URL: "http://secret-store:12001" - PARITY_ADDRESS: "0x00bd138abd70e2f00903268f3db08f2d25677c9e" - PARITY_PASSWORD: "node0" - PARITY_KEYFILE: "/parity-data/keys/validator0.json" + PARITY_URL: ${SIGNING_NODE_URL} + SECRET_STORE_URL: ${SECRET_STORE_URL} + PARITY_ADDRESS: ${PUBLISHER_ADDRESS} + PARITY_PASSWORD: ${PUBLISHER_PASSWORD} + PARITY_KEYFILE: ${PUBLISHER_KEYFILE} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} + LOG_LEVEL: ${EVENTS_HANDLER_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ../networks/spree/authorities/:/parity-data/keys diff --git a/start_ocean.sh b/start_ocean.sh index 6809677..e92536e 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -64,10 +64,14 @@ export DB_CLIENT_KEY="" export DB_CLIENT_CERT="" CHECK_ELASTIC_VM_COUNT=true +export BRIZO_LOG_LEVEL=DEBUG +export EVENTS_HANDLER_LOG_LEVEL=DEBUG + # 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 PUBLISHER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0 -export PUBLISHER_PASSWORD=secret +export PUBLISHER_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e +export PUBLISHER_PASSWORD=node0 +export PUBLISHER_KEYFILE="/parity-data/keys/validator0.json" export SECRET_STORE_URL=http://secret-store:12001 export SIGNING_NODE_URL=http://secret-store-signing-node:8545 From 48b35c04543a8dc3c557778b4add1fea82db3d3c Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 28 Aug 2019 22:07:46 +0200 Subject: [PATCH 04/12] Set log level to info, use version env var for events-handler image. --- compose-files/events_handler.yml | 2 +- start_ocean.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml index c157ff2..aaa937b 100644 --- a/compose-files/events_handler.yml +++ b/compose-files/events_handler.yml @@ -1,7 +1,7 @@ version: '3' services: events-handler: - image: oceanprotocol/ocean-events-handler:v0.1.0 + image: oceanprotocol/ocean-events-handler:$EVENTS_HANDLER_VERSION networks: backend: ipv4_address: 172.15.0.22 diff --git a/start_ocean.sh b/start_ocean.sh index e92536e..251a77a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -64,8 +64,8 @@ export DB_CLIENT_KEY="" export DB_CLIENT_CERT="" CHECK_ELASTIC_VM_COUNT=true -export BRIZO_LOG_LEVEL=DEBUG -export EVENTS_HANDLER_LOG_LEVEL=DEBUG +export BRIZO_LOG_LEVEL="INFO" +export EVENTS_HANDLER_LOG_LEVEL="INFO" # 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 From c4fc4d81668e21c409e52ac78d36de5308c77653 Mon Sep 17 00:00:00 2001 From: ssallam Date: Thu, 29 Aug 2019 11:16:13 +0200 Subject: [PATCH 05/12] Update some env-var names to improve clarity, add accounts folder with a specific provider keyfile. Revert provider/publisher address to previous value. --- accounts/provider.json | 22 ++++++++++++++++++++++ compose-files/brizo.yml | 8 ++++---- compose-files/events_handler.yml | 8 ++++---- compose-files/pleuston.yml | 2 +- start_ocean.sh | 7 ++++--- 5 files changed, 35 insertions(+), 12 deletions(-) create mode 100755 accounts/provider.json diff --git a/accounts/provider.json b/accounts/provider.json new file mode 100755 index 0000000..2226e59 --- /dev/null +++ b/accounts/provider.json @@ -0,0 +1,22 @@ +{ + "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/compose-files/brizo.yml b/compose-files/brizo.yml index 3f927a2..265d442 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -17,10 +17,10 @@ services: PARITY_URL: ${SIGNING_NODE_URL} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} SECRET_STORE_URL: ${SECRET_STORE_URL} - PARITY_ADDRESS: ${PUBLISHER_ADDRESS} - PARITY_PASSWORD: ${PUBLISHER_PASSWORD} - PARITY_KEYFILE: ${PUBLISHER_KEYFILE} + PARITY_ADDRESS: ${PROVIDER_ADDRESS} + PARITY_PASSWORD: ${PROVIDER_PASSWORD} + PARITY_KEYFILE: ${PROVIDER_KEYFILE} LOG_LEVEL: ${BRIZO_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - - ../networks/spree/authorities/:/parity-data/keys + - ${ACCOUNTS_FOLDER}:/accounts diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml index aaa937b..cc71414 100644 --- a/compose-files/events_handler.yml +++ b/compose-files/events_handler.yml @@ -11,11 +11,11 @@ services: KEEPER_URL: ${KEEPER_RPC_URL} PARITY_URL: ${SIGNING_NODE_URL} SECRET_STORE_URL: ${SECRET_STORE_URL} - PARITY_ADDRESS: ${PUBLISHER_ADDRESS} - PARITY_PASSWORD: ${PUBLISHER_PASSWORD} - PARITY_KEYFILE: ${PUBLISHER_KEYFILE} + PARITY_ADDRESS: ${PROVIDER_ADDRESS} + PARITY_PASSWORD: ${PROVIDER_PASSWORD} + PARITY_KEYFILE: ${PROVIDER_KEYFILE} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} LOG_LEVEL: ${EVENTS_HANDLER_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - - ../networks/spree/authorities/:/parity-data/keys + - ${ACCOUNTS_FOLDER}:/accounts diff --git a/compose-files/pleuston.yml b/compose-files/pleuston.yml index b18fca2..cb37a16 100644 --- a/compose-files/pleuston.yml +++ b/compose-files/pleuston.yml @@ -14,6 +14,6 @@ services: environment: LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} REACT_APP_AQUARIUS_URI: ${AQUARIUS_URI} - REACT_APP_BRIZO_ADDRESS: ${PUBLISHER_ADDRESS} + REACT_APP_BRIZO_ADDRESS: ${PROVIDER_ADDRESS} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/pleuston/node_modules/@oceanprotocol/keeper-contracts/artifacts/:ro diff --git a/start_ocean.sh b/start_ocean.sh index 251a77a..d5c3099 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -69,9 +69,10 @@ export EVENTS_HANDLER_LOG_LEVEL="INFO" # 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 PUBLISHER_ADDRESS=0x00bd138abd70e2f00903268f3db08f2d25677c9e -export PUBLISHER_PASSWORD=node0 -export PUBLISHER_KEYFILE="/parity-data/keys/validator0.json" +export PROVIDER_ADDRESS=0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0 +export PROVIDER_PASSWORD=secret +export PROVIDER_KEYFILE="/accounts/provider.json" +export ACCOUNTS_FOLDER="../accounts" export SECRET_STORE_URL=http://secret-store:12001 export SIGNING_NODE_URL=http://secret-store-signing-node:8545 From 8b640d374fc64edceab1ca86a8bb38ab637ae63e Mon Sep 17 00:00:00 2001 From: ssallam Date: Mon, 2 Sep 2019 09:50:09 +0200 Subject: [PATCH 06/12] Update readme file and env vars. --- README.md | 26 ++++++++++++++++++++------ compose-files/brizo.yml | 6 +++--- compose-files/events_handler.yml | 8 ++++---- start_ocean.sh | 2 +- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3a8070d..a979120 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ cd barge ./start_ocean.sh ``` -That will run the current default versions of Aquarius, Brizo, Pleuston, 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, Brizo, Events handler, Pleuston, Keeper Contracts, and Faucet. It will also run a local Spree network (i.e. `--local-spree-node`). Welcome to Ocean Protocol @@ -57,15 +57,15 @@ docker system prune --all --volumes ## Options -The startup script comes with a set of options for customizing variou things. +The startup script comes with a set of options for customizing various things. ### Component Versions The default versions are always a combination of component versions which are considered stable. -| Aquarius | Brizo | Keeper | Pleuston | Faucet | -| -------- | --------- | --------- | -------- | -------- | -| `v0.3.8` | `v0.3.14` | `v0.10.3` | `v0.5.0` | `v0.2.6` | +| Aquarius | Brizo | Events handler | Keeper | Pleuston | Faucet | +| -------- | --------- | -------------- | --------- | -------- | -------- | +| `v0.3.8` | `v0.3.14` | `v0.1.1` | `v0.10.3` | `v0.5.0` | `v0.2.6` | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. @@ -73,6 +73,7 @@ You can override the Docker image tag used for a particular component by setting - `AQUARIUS_VERSION` - `BRIZO_VERSION` +- `EVENTS_HANDLER_VERSION` - `KEEPER_VERSION` - `PLEUSTON_VERSION` - `FAUCET_VERSION` @@ -96,6 +97,7 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Pleust | `--no-pleuston` | Start up Ocean without the `pleuston` Building Block. Helpful for development on `pleuston`. | | `--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. | | `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. | @@ -146,6 +148,14 @@ By default it will start one container. This Building Block can be disabled by s | -------- | ------------- | ----------------- | --------------------- | ----------------------------------------------- | | `brizo` | `8030` | http://brizo:8030 | http://localhost:8030 | [Brizo](https://github.com/oceanprotocol/brizo) | +### Events handler + +By default it will start one container. This Building Block can be disabled by setting the `--no-events-handler` flag. + +| Hostname | External Port | Internal URL | Local URL | Description | +| ----------------- | ------------- | ----------------- | --------------------- | -------------------------------------------------------------------- | +| `events-handler` | | | | [Events-handler](https://github.com/oceanprotocol/events-handler-py) | + ### 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. @@ -207,7 +217,11 @@ you will have available a keeper node in the local and private Spree Network wit | `0xe08A1dAe983BC701D05E492DB80e0144f8f4b909` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether | | `0xbcE5A3468386C64507D30136685A99cFD5603135` | mnemonic | [info here](#spree-mnemonic) | 1000000000 Ether | -Use one of the above accounts to populate `PARITY_ADDRESS` and `PARITY_PASSWORD` in `brizo.env` file to avoid account `locked` issues from the keeper contracts. +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 `pleuston` instance so that published assets get +assigned the correct provider address. ### Spree Mnemonic diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index 265d442..aecac7f 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -17,9 +17,9 @@ services: PARITY_URL: ${SIGNING_NODE_URL} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} SECRET_STORE_URL: ${SECRET_STORE_URL} - PARITY_ADDRESS: ${PROVIDER_ADDRESS} - PARITY_PASSWORD: ${PROVIDER_PASSWORD} - PARITY_KEYFILE: ${PROVIDER_KEYFILE} + PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} + PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} + PROVIDER_KEYFILE: ${PROVIDER_KEYFILE} LOG_LEVEL: ${BRIZO_LOG_LEVEL} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro diff --git a/compose-files/events_handler.yml b/compose-files/events_handler.yml index cc71414..352765c 100644 --- a/compose-files/events_handler.yml +++ b/compose-files/events_handler.yml @@ -1,7 +1,7 @@ version: '3' services: events-handler: - image: oceanprotocol/ocean-events-handler:$EVENTS_HANDLER_VERSION + image: oceanprotocol/events-handler-py:$EVENTS_HANDLER_VERSION networks: backend: ipv4_address: 172.15.0.22 @@ -11,9 +11,9 @@ services: KEEPER_URL: ${KEEPER_RPC_URL} PARITY_URL: ${SIGNING_NODE_URL} SECRET_STORE_URL: ${SECRET_STORE_URL} - PARITY_ADDRESS: ${PROVIDER_ADDRESS} - PARITY_PASSWORD: ${PROVIDER_PASSWORD} - PARITY_KEYFILE: ${PROVIDER_KEYFILE} + PROVIDER_ADDRESS: ${PROVIDER_ADDRESS} + PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} + PROVIDER_KEYFILE: ${PROVIDER_KEYFILE} LOCAL_CONTRACTS: ${KEEPER_DEPLOY_CONTRACTS} LOG_LEVEL: ${EVENTS_HANDLER_LOG_LEVEL} volumes: diff --git a/start_ocean.sh b/start_ocean.sh index d5c3099..4881c68 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -15,7 +15,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:v0.1.0} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-latest} export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} From 120eb690c98204bfa72085a1be26b5c36959b0d4 Mon Sep 17 00:00:00 2001 From: ssallam Date: Mon, 2 Sep 2019 16:58:18 +0200 Subject: [PATCH 07/12] Update default version of keeper-contracts and brizo. --- start_ocean.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start_ocean.sh b/start_ocean.sh index 4881c68..9e1db8e 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -14,9 +14,9 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.3.14} +export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.1} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-latest} -export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3} +export KEEPER_VERSION=${KEEPER_VERSION:-v0.11.1} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} From 6452111ddd9d0b902f3cfdec8bb81e1c7500432b Mon Sep 17 00:00:00 2001 From: ssallam Date: Mon, 9 Sep 2019 10:08:12 +0200 Subject: [PATCH 08/12] Set default Brizo workers to 5 workers, add consumer account to duero local node keys and secret-store signer node. --- compose-files/brizo.yml | 1 + networks/duero/keys/consumer.json | 22 +++++++++++++++++++ .../secret-store/keys/duero/consumer.json | 22 +++++++++++++++++++ start_ocean.sh | 1 + 4 files changed, 46 insertions(+) create mode 100644 networks/duero/keys/consumer.json create mode 100644 networks/secret-store/keys/duero/consumer.json diff --git a/compose-files/brizo.yml b/compose-files/brizo.yml index aecac7f..d91b855 100644 --- a/compose-files/brizo.yml +++ b/compose-files/brizo.yml @@ -21,6 +21,7 @@ services: PROVIDER_PASSWORD: ${PROVIDER_PASSWORD} PROVIDER_KEYFILE: ${PROVIDER_KEYFILE} LOG_LEVEL: ${BRIZO_LOG_LEVEL} + BRIZO_WORKERS: ${BRIZO_WORKERS} volumes: - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro - ${ACCOUNTS_FOLDER}:/accounts diff --git a/networks/duero/keys/consumer.json b/networks/duero/keys/consumer.json new file mode 100644 index 0000000..15d6d06 --- /dev/null +++ b/networks/duero/keys/consumer.json @@ -0,0 +1,22 @@ +{ + "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/consumer.json b/networks/secret-store/keys/duero/consumer.json new file mode 100644 index 0000000..15d6d06 --- /dev/null +++ b/networks/secret-store/keys/duero/consumer.json @@ -0,0 +1,22 @@ +{ + "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 9e1db8e..051ca14 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -64,6 +64,7 @@ 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" From 555c7053ad0bfd85d7cb50bb3cc2d862d4465c42 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 11 Sep 2019 11:33:01 +0200 Subject: [PATCH 09/12] bump to Brizo v0.4.2 --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 051ca14..49b4c8a 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -14,7 +14,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} -export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.1} +export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.2} export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-latest} export KEEPER_VERSION=${KEEPER_VERSION:-v0.11.1} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1} From 0e24bb6746191f7b578d9b6581509f30a3b390ec Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 11 Sep 2019 13:26:01 +0200 Subject: [PATCH 10/12] set specific events handler version --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 49b4c8a..27bcd81 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -15,7 +15,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.2} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-latest} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.2.1} export KEEPER_VERSION=${KEEPER_VERSION:-v0.11.1} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} From a38f711d9231ece7f2cb904a954a820ac9ef6d58 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 11 Sep 2019 13:27:19 +0200 Subject: [PATCH 11/12] set specific events handler version, with actually existing version --- start_ocean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start_ocean.sh b/start_ocean.sh index 27bcd81..0cfad50 100755 --- a/start_ocean.sh +++ b/start_ocean.sh @@ -15,7 +15,7 @@ COMPOSE_DIR="${DIR}/compose-files" # Default versions of Aquarius, Brizo, Keeper Contracts and Pleuston export AQUARIUS_VERSION=${AQUARIUS_VERSION:-v0.3.8} export BRIZO_VERSION=${BRIZO_VERSION:-v0.4.2} -export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.2.1} +export EVENTS_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:-v0.1.2} export KEEPER_VERSION=${KEEPER_VERSION:-v0.11.1} export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1} export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6} From 5079544e734220beb7148fa71042c166e1f2b31b Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Wed, 11 Sep 2019 13:32:41 +0200 Subject: [PATCH 12/12] update version matrix --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a979120..2ba4e67 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ cd barge ./start_ocean.sh ``` -That will run the current default versions of Aquarius, Brizo, Events handler, Pleuston, 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, Brizo, Events Handler, Pleuston, Keeper Contracts, and Faucet. It will also run a local Spree network (i.e. `--local-spree-node`). Welcome to Ocean Protocol @@ -63,9 +63,9 @@ 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 | Pleuston | Faucet | +| Aquarius | Brizo | Events Handler | Keeper | Pleuston | Faucet | | -------- | --------- | -------------- | --------- | -------- | -------- | -| `v0.3.8` | `v0.3.14` | `v0.1.1` | `v0.10.3` | `v0.5.0` | `v0.2.6` | +| `v0.3.8` | `v0.4.2` | `v0.1.2` | `v0.11.1` | `v0.5.0` | `v0.2.6` | You can use the `--latest` option to pull the most recent Docker images for all components, which are always tagged as `latest` in Docker. The `latest` Docker image tag derives from the default main branch of the component's Git repo. @@ -97,7 +97,7 @@ will use the default Docker image tags for Aquarius, Keeper Contracts and Pleust | `--no-pleuston` | Start up Ocean without the `pleuston` Building Block. Helpful for development on `pleuston`. | | `--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-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. | | `--mongodb` | Start up Ocean with MongoDB as DB engine for Aquarius instead of Elasticsearch. | @@ -148,7 +148,7 @@ By default it will start one container. This Building Block can be disabled by s | -------- | ------------- | ----------------- | --------------------- | ----------------------------------------------- | | `brizo` | `8030` | http://brizo:8030 | http://localhost:8030 | [Brizo](https://github.com/oceanprotocol/brizo) | -### Events handler +### Events Handler By default it will start one container. This Building Block can be disabled by setting the `--no-events-handler` flag.