From 53ea965166a7054407e1bbbcb74599580bb39fbd Mon Sep 17 00:00:00 2001
From: nhpd <dmitry.klpv@gmail.com>
Date: Wed, 19 Jul 2023 19:15:08 +0400
Subject: [PATCH] chore: update hermes

---
 setup/Makefile                       | 2 +-
 setup/docker-compose.yml             | 2 +-
 setup/dockerbuilds/Dockerfile.hermes | 2 +-
 setup/hermes/config.toml             | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/setup/Makefile b/setup/Makefile
index ea649a28..c55256df 100644
--- a/setup/Makefile
+++ b/setup/Makefile
@@ -8,7 +8,7 @@ build-neutron:
 		cd $(APP_DIR)/neutron && $(MAKE) build-docker-image
 
 build-hermes:
-		@docker build -f dockerbuilds/Dockerfile.hermes -t hermes:1.3.0-a285c01 .
+		@docker build -f dockerbuilds/Dockerfile.hermes -t hermes:1.6.0-1c1cf029 .
 
 build-relayer:
 		cd $(APP_DIR)/neutron-query-relayer/ && make build-docker
diff --git a/setup/docker-compose.yml b/setup/docker-compose.yml
index fabdfd22..4df9c980 100644
--- a/setup/docker-compose.yml
+++ b/setup/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       - neutron-testing
 
   hermes:
-    image: hermes:1.3.0-a285c01
+    image: hermes:1.6.0-1c1cf029
     depends_on:
       - "neutron-node"
       - "gaia-node"
diff --git a/setup/dockerbuilds/Dockerfile.hermes b/setup/dockerbuilds/Dockerfile.hermes
index 30d9a04c..150683c1 100644
--- a/setup/dockerbuilds/Dockerfile.hermes
+++ b/setup/dockerbuilds/Dockerfile.hermes
@@ -3,7 +3,7 @@ COPY ./hermes/ /app/network/hermes/
 WORKDIR /app
 RUN apt-get update && apt-get install -y wget && \
     PLATFORM=`uname -a | awk '{print $(NF-1)}'` && \
-    VERSION=v1.4.0 && \
+    VERSION=v1.6.0 && \
     TARNAME="hermes-${VERSION}-${PLATFORM}-unknown-linux-gnu.tar.gz" && \
     wget "https://github.com/informalsystems/hermes/releases/download/${VERSION}/${TARNAME}" && \
     tar -xf "$TARNAME" && \
diff --git a/setup/hermes/config.toml b/setup/hermes/config.toml
index 52ab2113..01f0261f 100644
--- a/setup/hermes/config.toml
+++ b/setup/hermes/config.toml
@@ -93,7 +93,8 @@ port = 3001
 id = 'test-1'
 rpc_addr = 'http://neutron-node:26657'
 grpc_addr = 'http://neutron-node:9090'
-websocket_addr = 'ws://neutron-node:26657/websocket'
+event_source = { mode = 'push', url = 'ws://neutron-node:26657/websocket', batch_delay = '200ms' }
+ccv_consumer_chain = true
 rpc_timeout = '10s'
 account_prefix = 'neutron'
 key_name = 'testkey_1'
@@ -107,7 +108,6 @@ max_tx_size = 2097152
 clock_drift = '5s'
 max_block_time = '10s'
 trusting_period = '14days'
-unbonding_period = '20days'
 trust_threshold = { numerator = '1', denominator = '3' }
 address_type = { derivation = 'cosmos' }
 
@@ -115,7 +115,7 @@ address_type = { derivation = 'cosmos' }
 id = 'test-2'
 rpc_addr = 'http://gaia-node:26657'
 grpc_addr = 'http://gaia-node:9090'
-websocket_addr = 'ws://gaia-node:26657/websocket'
+event_source = { mode = 'push', url = 'ws://gaia-node:26657/websocket', batch_delay = '200ms' }
 rpc_timeout = '10s'
 account_prefix = 'cosmos'
 key_name = 'testkey_2'
@@ -129,6 +129,5 @@ max_tx_size = 2097152
 clock_drift = '5s'
 max_block_time = '10s'
 trusting_period = '14days'
-unbonding_period = '21days'
 trust_threshold = { numerator = '1', denominator = '3' }
 address_type = { derivation = 'cosmos' }