Merge branch 'feature/new-brizo-support' into feature/new-brizo

# Conflicts:
#	compose-files/brizo.yml

compose-files/brizo.yml

@@ -19,5 +19,7 @@ services:
       SECRET_STORE_URL: ${SECRET_STORE_URL}
       PARITY_ADDRESS: ${PUBLISHER_ADDRESS}
       PARITY_PASSWORD: ${PUBLISHER_PASSWORD}
+      PARITY_KEYFILE: "/parity-data/keys/validator0.json"
     volumes:
       - ${KEEPER_ARTIFACTS_FOLDER}:/usr/local/keeper-contracts:ro
+      - ../networks/spree/authorities/:/parity-data/keys

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

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_HANDLER_VERSION=${EVENTS_HANDLER_VERSION:v0.1.0}
 export KEEPER_VERSION=${KEEPER_VERSION:-v0.10.3}
 export PLEUSTON_VERSION=${PLEUSTON_VERSION:-v0.5.1}
 export FAUCET_VERSION=${FAUCET_VERSION:-v0.2.6}
@@ -155,6 +156,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_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"
@@ -176,6 +178,7 @@ while :; do
         --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 PLEUSTON_VERSION="master"
@@ -193,6 +196,10 @@ while :; do
             COMPOSE_FILES="${COMPOSE_FILES/ -f ${COMPOSE_DIR}\/pleuston.yml/}"
             printf $COLOR_Y'Starting without Pleuston...\n\n'$COLOR_RESET
             ;;
+        --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