From 0785ba7028c5c503ea5f1b23a2169863f2c93907 Mon Sep 17 00:00:00 2001 From: ssallam Date: Mon, 26 Aug 2019 13:19:17 +0200 Subject: [PATCH 1/2] 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 2/2] 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