chore: fix ibc tests with chain-main ibc-go-v10

integration_tests/cosmoscli.py

@@ -939,12 +939,12 @@ def ibc_denom_trace(self, path, node):
             self.raw(
                 "query",
                 "ibc-transfer",
-                "denom-trace",
+                "denom",
                 denom_hash,
                 node=node,
                 output="json",
             )
-        )["denom_trace"]
+        )["denom"]
 
     def export(self, **kwargs):
         return self.raw("export", home=self.data_dir, **kwargs)

integration_tests/ibc_utils.py

@@ -456,10 +456,19 @@ def assert_trace_balance(addr):
         else:
             return False
 
-    denom_trace = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
-    assert denom_trace == {"path": f"transfer/{channel1}", "base_denom": denom0}
+    denom = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
+
+    assert denom["base"] == denom0
+    assert denom["trace"] == [{"port_id": "transfer", "channel_id": channel1}]
+
     for i, _ in enumerate(users):
-        wait_for_fn("assert balance", lambda: assert_trace_balance(addrs1[i]))
+        print(f"user{i+1} -> {addrs1[i]}")
+        addr = addrs1[i]
+
+        def check_balance(addr=addr):
+            return assert_trace_balance(addr)
+
+        wait_for_fn("assert balance", check_balance)
 
     # chainmain-1 -> cronos_777-1
     amt = amount // 2
@@ -484,7 +493,13 @@ def assert_balance(addr):
             assert rsp["code"] == 0, rsp["raw_log"]
 
         for i, _ in enumerate(users):
-            wait_for_fn("assert balance", lambda: assert_balance(addrs0[i]))
+            print(f"user{i+1} -> {addrs0[i]}")
+            addr = addrs0[i]
+
+            def check_balance(addr=addr):
+                return assert_balance(addr)
+
+            wait_for_fn("assert balance", check_balance)
 
         old_balance0 += amt
 
@@ -561,8 +576,9 @@ def check_fee():
     assert user0_balances == expected, user0_balances
     path = f"transfer/{dst_channel}/{base_denom0}"
     denom_hash = ibc_denom(dst_channel, base_denom0)
-    denom_trace = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
-    assert denom_trace == {"path": f"transfer/{dst_channel}", "base_denom": base_denom0}
+    denom = chains[1].ibc_denom_trace(path, ibc.chainmain.node_rpc(0))
+    assert denom["base"] == base_denom0
+    assert denom["trace"] == [{"port_id": "transfer", "channel_id": dst_channel}]
     user1_balances = get_balances(ibc.chainmain, user1)
     expected = [
         {"denom": base_denom1, "amount": f"{old_user1_base}"},

integration_tests/test_ibc_rly.py

@@ -13,7 +13,6 @@
     hermes_transfer,
     ibc_denom,
     ibc_incentivized_transfer,
-    ibc_multi_transfer,
     ibc_transfer,
     prepare_network,
     rly_transfer,
@@ -49,7 +48,7 @@
 @pytest.fixture(scope="module")
 def ibc(request, tmp_path_factory):
     "prepare-network"
-    name = "ibc_rly_evm"
+    name = "ibc_rly"
     path = tmp_path_factory.mktemp(name)
     yield from prepare_network(
         path,
@@ -429,7 +428,3 @@ def test_cronos_transfer_source_tokens(ibc):
 @pytest.mark.skip("skipping due to unsupported precompiled contract in hermes")
 def test_cronos_transfer_source_tokens_with_proxy(ibc):
     assert_transfer_source_tokens_topics(ibc, cronos_transfer_source_tokens_with_proxy)
-
-
-def test_ibc_multi(ibc):
-    ibc_multi_transfer(ibc)

nix/sources.json

@@ -1,14 +1,14 @@
 {
     "chain-main": {
-        "branch": "master",
+        "branch": "release/v7",
         "description": "Crypto.org Chain⛓: Croeseid Testnet and beyond development",
         "homepage": "https://crypto.org",
         "owner": "crypto-org-chain",
         "repo": "chain-main",
-        "rev": "1baff8aed447abcad5c8d2ea4f92d7ae00d8b8b3",
-        "sha256": "01cg1jfg4l2d6g2spxf3c2375zj0siv8wg1lssafv7ry51f3zyqz",
+        "rev": "d3ef39afd014cc39a57ac5391b5ac27cc3e9370e",
+        "sha256": "1vg6v1vs01n4pwnzda8ycn05c8k9k6hwwklibw9q3rad54kk7jm3",
         "type": "tarball",
-        "url": "https://github.com/crypto-org-chain/chain-main/archive/1baff8aed447abcad5c8d2ea4f92d7ae00d8b8b3.tar.gz",
+        "url": "https://github.com/crypto-org-chain/chain-main/archive/d3ef39afd014cc39a57ac5391b5ac27cc3e9370e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "dapptools": {