From 1ffb99be04e44e3ea04931de076b4ee7f43bcc64 Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Wed, 29 May 2024 11:37:31 +0800
Subject: [PATCH] Problem: latest hermes is not used in integration tests
 (#1361)

* Problem: latest hermes is not used in integration tests

* larger trust_period
---
 integration_tests/ibc_utils.py              | 1 -
 integration_tests/test_ibc_update_client.py | 2 +-
 nix/hermes.nix                              | 3 ---
 nix/sources.json                            | 8 ++++----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/integration_tests/ibc_utils.py b/integration_tests/ibc_utils.py
index 3f0c7f8775..280525541d 100644
--- a/integration_tests/ibc_utils.py
+++ b/integration_tests/ibc_utils.py
@@ -346,7 +346,6 @@ def get_balances(chain, addr):
 
 def ibc_multi_transfer(ibc):
     chains = [ibc.cronos.cosmos_cli(), ibc.chainmain.cosmos_cli()]
-    # FIXME: more users after batch fix
     users = [f"user{i}" for i in range(1, 51)]
     addrs0 = [chains[0].address(user) for user in users]
     addrs1 = [chains[1].address(user) for user in users]
diff --git a/integration_tests/test_ibc_update_client.py b/integration_tests/test_ibc_update_client.py
index fd00cf6d07..f4f5fa7686 100644
--- a/integration_tests/test_ibc_update_client.py
+++ b/integration_tests/test_ibc_update_client.py
@@ -55,7 +55,7 @@ def test_ibc_update_client_via_proposal(ibc):
         "--reference-chain",
         "chainmain-1",
     ]
-    trust_period = "30s"
+    trust_period = "45s"
     subprocess.check_call(cmd + ["--trusting-period", trust_period])
     # create new connection with new client
     cmd = cmd0 + [
diff --git a/nix/hermes.nix b/nix/hermes.nix
index 241285515d..58ae46023a 100644
--- a/nix/hermes.nix
+++ b/nix/hermes.nix
@@ -21,9 +21,6 @@ rustPlatform.buildRustPackage rec {
   ];
   cargoLock = {
     lockFile = "${src}/Cargo.lock";
-    outputHashes = {
-      "ibc-proto-0.38.0" = "sha256-UhpWBzraC6fMPJ0BVK6CxdrywoEayNq0tBU0N3MxmB4=";
-    };
   };
   doCheck = false;
   RUSTFLAGS = "--cfg ossl111 --cfg ossl110 --cfg ossl101";
diff --git a/nix/sources.json b/nix/sources.json
index cf8c702200..a0613ffbee 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -73,15 +73,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "ibc-rs": {
-        "branch": "v1.7.0",
+        "branch": "v1.8.3",
         "description": "IBC modules and relayer - Formal specifications and Rust implementation",
         "homepage": "",
         "owner": "informalsystems",
         "repo": "ibc-rs",
-        "rev": "0181c462486b7801d4ec720aa34f34576fcf981b",
-        "sha256": "1mwm0ia69wlshr5m5a8vblc6zh244rrxxm7np5df74jg330nyw7z",
+        "rev": "1d2aa0c7108dc278e00731cc91bc366a418e2543",
+        "sha256": "08i1w1lcdwlpa70vzw305g0hh23q0mkby8fvf693zxq430y55gjs",
         "type": "tarball",
-        "url": "https://github.com/devashishdxt/hermes/archive/0181c462486b7801d4ec720aa34f34576fcf981b.tar.gz",
+        "url": "https://github.com/informalsystems/hermes/archive/1d2aa0c7108dc278e00731cc91bc366a418e2543.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {