Update Nix and CI dependencies (#2523)

* Update Nix and CI dependencies * Fix new account sequence mismatch error pattern * Update Cosmos.nix
informalsystems · Aug 8, 2022 · 190d810 · 190d810
1 parent 5df3547
commit 190d810
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 65 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -62,6 +62,9 @@ jobs:
           - package: ibc-go-v4-simapp
             command: simd
             account_prefix: cosmos
+          - package: ibc-go-v5-simapp
+            command: simd
+            account_prefix: cosmos
           - package: osmosis
             command: osmosisd
             account_prefix: osmo

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -39,6 +39,7 @@
               ibc-go-v2-simapp
               ibc-go-v3-simapp
               ibc-go-v4-simapp
+              ibc-go-v5-simapp
               apalache
             ;
 

diff --git a/relayer/src/error.rs b/relayer/src/error.rs
@@ -571,10 +571,7 @@ impl GrpcStatusSubdetail {
     /// there are hermes code changes such that the E < G case is not previously caught anymore,
     /// then this predicate will catch all "account sequence mismatch" errors
     pub fn is_account_sequence_mismatch_that_requires_refresh(&self) -> bool {
-        self.status
-            .message()
-            .trim_start()
-            .starts_with("account sequence mismatch")
+        self.status.message().contains("account sequence mismatch")
     }
 
     /// Check whether this gRPC error matches:
@@ -653,6 +650,12 @@ mod tests {
                     "account sequence mismatch, expected 200, got 100 --> this part has changed",
                 result: Some((200, 100)),
             },
+            Test {
+                name: "good changed mismatch error, expected > got",
+                message:
+                    "codespace sdk code 32: incorrect account sequence: account sequence mismatch, expected 200, got 100",
+                result: Some((200, 100)),
+            },
             Test {
                 name: "bad mismatch error, bad expected",
                 message: