Problem: packet_sequence is not indexed in relayer event

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## UNRELEASED
+
+### State Machine Breaking
+
+- [#1318](https://github.com/crypto-org-chain/cronos/pull/1318) Add packet_sequence index in relayer event.
+
 *February 5, 2024*
 
 ## v1.1.0-rc3

go.mod

@@ -237,7 +237,7 @@ replace (
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240201093104-a762382867f5
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240215080911-ebecd4c35025
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0

go.sum

@@ -484,8 +484,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1
 github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2 h1:z3LXxlOuRHfRuS6LpA3t9eSaekHmzsdrrDkaXP8UEeU=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20240201093104-a762382867f5 h1:0oopvRSoHpEiKFqx7Vn0mJlGcSyLmxK89FR57BqcxC0=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20240201093104-a762382867f5/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240215080911-ebecd4c35025 h1:lc8T/ho1MtbKydKhUfF2DB74Me8+rQnD2n1FjUKLqMo=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240215080911-ebecd4c35025/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e h1:vnyepPQ/m25+19xcTuBUdRxmltZ/EjVWNqEjhg7Ummk=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI=

gomod2nix.toml

@@ -216,8 +216,8 @@ schema = 3
     hash = "sha256-lDIqRLUrXYCb9mmFBY/+WW+ee69+IkxOgqjHVyo4ij0="
     replaced = "github.com/crypto-org-chain/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20240201093104-a762382867f5"
-    hash = "sha256-tNF3+JH39zphjbOXrkf4JpxJlEsguN7ZHyJ3cUP1CjA="
+    version = "v0.6.1-0.20240215080911-ebecd4c35025"
+    hash = "sha256-MlDcZntdbcH3+PzYtZW1hBwM59Eyb2KNkUd5fNXrHUM="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.2"

integration_tests/cosmoscli.py

@@ -222,13 +222,16 @@ def tx_search(self, events: str):
             self.raw("query", "txs", events=events, output="json", node=self.node_rpc)
         )
 
-    def tx_search_rpc(self, criteria: str):
+    def tx_search_rpc(self, criteria: str, order=None):
         node_rpc_http = "http" + self.node_rpc.removeprefix("tcp")
+        params = {
+            "query": f'"{criteria}"',
+        }
+        if order:
+            params["order_by"] = f'"{order}"'
         rsp = requests.get(
             f"{node_rpc_http}/tx_search",
-            params={
-                "query": f'"{criteria}"',
-            },
+            params=params,
         ).json()
         assert "error" not in rsp, rsp["error"]
         return rsp["result"]["txs"]

integration_tests/ibc_utils.py

@@ -427,7 +427,7 @@ def check_balance_change():
     actual = chains[0].balance(sender, base_denom)
     assert actual == old_amt_sender_base, actual
     assert chains[1].balance(receiver, "basecro") == old_amt_receiver_base - fee_amount
-    return amount
+    return amount, packet_seq
 
 
 def ibc_denom(channel, denom):

integration_tests/test_ibc_rly.py

@@ -25,6 +25,7 @@
     get_method_map,
     get_topic_data,
     module_address,
+    parse_events_rpc,
     wait_for_fn,
     wait_for_new_blocks,
 )
@@ -34,6 +35,8 @@
 CONTRACT = "0x0000000000000000000000000000000000000065"
 contract_info = json.loads(CONTRACT_ABIS["IRelayerModule"].read_text())
 method_map = get_method_map(contract_info)
+method_name_map = get_method_map(contract_info, by_name=True)
+method_with_seq = ["RecvPacket", "WriteAcknowledgement", "AcknowledgePacket"]
 cronos_signer2 = ADDRS["signer2"]
 src_amount = 10
 src_denom = "basecro"
@@ -106,20 +109,26 @@ def burn(burner, amt, denom):
     }
 
 
-def recv_packet(src, dst, amt, denom):
+def recv_packet(seq, src, dst, amt, denom):
     return {
+        "packetSequence": keccak(text=f"{seq}"),
+        "packetSrcPort": keccak(text="transfer"),
+        "packetSrcChannel": keccak(text=channel),
+        "packetDstPort": "transfer",
+        "packetDstChannel": channel,
+        "connectionId": "connection-0",
         "packetDataHex": (dst, src, [(amt, denom)]),
     }
 
 
-def acknowledge_packet():
+def acknowledge_packet(seq):
     return {
+        "packetSequence": keccak(text=f"{seq}"),
         "packetSrcPort": keccak(text="transfer"),
         "packetSrcChannel": keccak(text=channel),
-        "packetDstPort": keccak(text="transfer"),
+        "packetDstPort": "transfer",
         "packetDstChannel": channel,
-        "packetChannelOrdering": "ORDER_UNORDERED",
-        "packetConnection": "connection-0",
+        "connectionId": "connection-0",
     }
 
 
@@ -129,9 +138,14 @@ def denom_trace(denom):
     }
 
 
-def write_ack(src, dst, amt, denom):
+def write_ack(seq, src, dst, amt, denom):
     return {
-        "packetConnection": "connection-0",
+        "packetSequence": keccak(text=f"{seq}"),
+        "packetSrcPort": keccak(text="transfer"),
+        "packetSrcChannel": keccak(text=channel),
+        "packetDstPort": "transfer",
+        "packetDstChannel": channel,
+        "connectionId": "connection-0",
         "packetDataHex": (dst, src, [(amt, denom)]),
     }
 
@@ -158,6 +172,35 @@ def send_from_acc_to_module(src, dst, amt, denom):
     ]
 
 
+def get_send_packet_seq(
+    cli,
+    criteria="message.action='/ibc.applications.transfer.v1.MsgTransfer'",
+):
+    txs = cli.tx_search_rpc(
+        criteria,
+        order="desc",
+    )
+    for tx in txs:
+        res = tx["tx_result"]
+        events = parse_events_rpc(res["events"])
+        target = events.get("send_packet")
+        if target and target["packet_sequence"]:
+            return target["packet_sequence"]
+    return None
+
+
+def filter_logs_since(w3, start, name, seq):
+    topic = method_name_map.get(name)
+    assert topic
+    return w3.eth.get_logs(
+        {
+            "fromBlock": start,
+            "address": [CONTRACT],
+            "topics": [topic, "0x" + keccak(text=f"{seq}").hex()],
+        }
+    )
+
+
 def test_ibc(ibc):
     # chainmain-1 relayer -> cronos_777-1 signer2
     w3 = ibc.cronos.w3
@@ -177,25 +220,32 @@ def check_balance_change():
     wait_for_fn("balance change", check_balance_change)
     assert old_dst_balance + dst_amount == new_dst_balance
     logs = get_logs_since(w3, CONTRACT, start)
-    relayer0 = ibc.chainmain.cosmos_cli().address("relayer")
+    chainmain_cli = ibc.chainmain.cosmos_cli()
+    relayer0 = chainmain_cli.address("relayer")
     relayer = to_checksum_address(bech32_to_eth(relayer0))
     cronos_addr = module_address("cronos")
     transfer_addr = module_address("transfer")
+    seq = get_send_packet_seq(chainmain_cli)
     expected = [
-        recv_packet(relayer0, cronos_signer2, src_amount, src_denom),
+        recv_packet(seq, relayer0, cronos_signer2, src_amount, src_denom),
         denom_trace(denom),
         *send_from_module_to_acc(transfer_addr, cronos_signer2, src_amount, denom),
         fungible(cronos_signer2, relayer, src_amount, src_denom),
         *send_from_acc_to_module(cronos_signer2, cronos_addr, src_amount, denom),
         *send_from_module_to_acc(cronos_addr, cronos_signer2, dst_amount, dst_denom),
-        write_ack(relayer0, cronos_signer2, src_amount, src_denom),
+        write_ack(seq, relayer0, cronos_signer2, src_amount, src_denom),
     ]
     assert len(logs) == len(expected)
     height = logs[0]["blockNumber"]
     assert_duplicate(ibc.cronos.base_port(0), height)
     for i, log in enumerate(logs):
-        method_name, args = get_topic_data(w3, method_map, contract_info, log)
-        assert args == AttributeDict(expected[i]), [i, method_name]
+        method_name, topic = get_topic_data(w3, method_map, contract_info, log)
+        assert topic == AttributeDict(expected[i]), [i, method_name]
+        # test filter by seq
+        if method_name in method_with_seq:
+            flogs = filter_logs_since(w3, start, method_name, seq)[0]
+            _, ftopic = get_topic_data(w3, method_map, contract_info, flogs)
+            assert ftopic == topic, method_name
 
 
 def get_escrow_address(cli, channel):
@@ -209,7 +259,7 @@ def test_ibc_incentivized_transfer(ibc):
     cli = ibc.cronos.cosmos_cli()
     wait_for_new_blocks(cli, 1)
     start = w3.eth.get_block_number()
-    amount = ibc_incentivized_transfer(ibc)
+    amount, seq0 = ibc_incentivized_transfer(ibc)
     logs = get_logs_since(w3, CONTRACT, start)
     fee_denom = "ibcfee"
     fee = f"{src_amount}{fee_denom}"
@@ -219,75 +269,79 @@ def test_ibc_incentivized_transfer(ibc):
     checksum_dst_adr = to_checksum_address(bech32_to_eth(dst_adr))
     feeibc_addr = module_address("feeibc")
     escrow = get_escrow_address(cli, channel)
+    seq1 = get_send_packet_seq(ibc.chainmain.cosmos_cli())
     expected = [
-        acknowledge_packet(),
+        acknowledge_packet(seq0),
         distribute_fee(src_relayer, fee),
         *send_coins(feeibc_addr, src_relayer, src_amount, fee_denom),
         distribute_fee(src_relayer, fee),
         *send_coins(feeibc_addr, src_relayer, src_amount, fee_denom),
         distribute_fee(cronos_signer2, fee),
         *send_coins(feeibc_addr, cronos_signer2, src_amount, fee_denom),
         fungible(checksum_dst_adr, cronos_signer2, amount, dst_denom),
-        recv_packet(dst_adr, cronos_signer2, amount, transfer_denom),
+        recv_packet(seq1, dst_adr, cronos_signer2, amount, transfer_denom),
         *send_coins(escrow, cronos_signer2, amount, dst_denom),
         fungible(cronos_signer2, checksum_dst_adr, amount, transfer_denom),
-        write_ack(dst_adr, cronos_signer2, amount, transfer_denom),
+        write_ack(seq1, dst_adr, cronos_signer2, amount, transfer_denom),
     ]
     assert len(logs) == len(expected)
     for i, log in enumerate(logs):
-        method_name, args = get_topic_data(w3, method_map, contract_info, log)
-        assert args == AttributeDict(expected[i]), [i, method_name]
+        method_name, topic = get_topic_data(w3, method_map, contract_info, log)
+        assert topic == AttributeDict(expected[i]), [i, method_name]
+        # test filter by seq
+        if method_name in method_with_seq:
+            seq = seq0 if method_name == "AcknowledgePacket" else seq1
+            flogs = filter_logs_since(w3, start, method_name, seq)[0]
+            _, ftopic = get_topic_data(w3, method_map, contract_info, flogs)
+            assert ftopic == topic, method_name
 
 
-def get_transfer_source_tokens_topics(dst_adr, amount, contract, escrow):
+def assert_transfer_source_tokens_topics(ibc, fn):
+    cli = ibc.cronos.cosmos_cli()
+    wait_for_new_blocks(cli, 1)
+    w3 = ibc.cronos.w3
+    start = w3.eth.get_block_number()
+    amount, contract = fn(ibc)
+    logs = get_logs_since(w3, CONTRACT, start)
+    escrow = get_escrow_address(cli, channel)
+    dst_adr = ibc.chainmain.cosmos_cli().address("signer2")
+    seq0 = get_send_packet_seq(
+        ibc.cronos.cosmos_cli(),
+        criteria="message.action='/ethermint.evm.v1.MsgEthereumTx'",
+    )
+    seq1 = get_send_packet_seq(ibc.chainmain.cosmos_cli())
     checksum_dst_adr = to_checksum_address(bech32_to_eth(dst_adr))
     cronos_addr = module_address("cronos")
     cronos_denom = f"cronos{contract}"
-    transfer_cronos_denom = f"transfer/{channel}/{cronos_denom}"
-    return [
-        acknowledge_packet(),
+    transfer_denom = f"transfer/{channel}/{cronos_denom}"
+    expected = [
+        acknowledge_packet(seq0),
         fungible(checksum_dst_adr, ADDRS["validator"], amount, cronos_denom),
-        recv_packet(dst_adr, cronos_signer2, amount, transfer_cronos_denom),
+        recv_packet(seq1, dst_adr, cronos_signer2, amount, transfer_denom),
         *send_coins(escrow, cronos_signer2, amount, cronos_denom),
-        fungible(cronos_signer2, checksum_dst_adr, amount, transfer_cronos_denom),
+        fungible(cronos_signer2, checksum_dst_adr, amount, transfer_denom),
         *send_coins(cronos_signer2, cronos_addr, amount, cronos_denom),
         coin_spent(cronos_addr, amount, cronos_denom),
         burn(cronos_addr, amount, cronos_denom),
-        write_ack(dst_adr, cronos_signer2, amount, transfer_cronos_denom),
+        write_ack(seq1, dst_adr, cronos_signer2, amount, transfer_denom),
     ]
-
-
-def test_cronos_transfer_source_tokens(ibc):
-    cli = ibc.cronos.cosmos_cli()
-    wait_for_new_blocks(cli, 1)
-    w3 = ibc.cronos.w3
-    start = w3.eth.get_block_number()
-    amount, contract = cronos_transfer_source_tokens(ibc)
-    logs = get_logs_since(w3, CONTRACT, start)
-    escrow = get_escrow_address(cli, channel)
-    dst_adr = ibc.chainmain.cosmos_cli().address("signer2")
-    expected = get_transfer_source_tokens_topics(dst_adr, amount, contract, escrow)
     assert len(logs) == len(expected)
     height = logs[0]["blockNumber"]
     assert_duplicate(ibc.cronos.base_port(0), height)
     for i, log in enumerate(logs):
-        method_name, args = get_topic_data(w3, method_map, contract_info, log)
-        assert args == AttributeDict(expected[i]), [i, method_name]
+        method_name, topic = get_topic_data(w3, method_map, contract_info, log)
+        assert topic == AttributeDict(expected[i]), [i, method_name]
+        # test filter by seq
+        if method_name in method_with_seq:
+            seq = seq0 if method_name == "AcknowledgePacket" else seq1
+            flogs = filter_logs_since(w3, start, method_name, seq)[0]
+            _, ftopic = get_topic_data(w3, method_map, contract_info, flogs)
+            assert ftopic == topic, method_name
+
+
+def test_cronos_transfer_source_tokens(ibc):
+    assert_transfer_source_tokens_topics(ibc, cronos_transfer_source_tokens)
 
 
 def test_cronos_transfer_source_tokens_with_proxy(ibc):
-    cli = ibc.cronos.cosmos_cli()
-    wait_for_new_blocks(cli, 1)
-    w3 = ibc.cronos.w3
-    start = w3.eth.get_block_number()
-    amount, contract = cronos_transfer_source_tokens_with_proxy(ibc)
-    logs = get_logs_since(w3, CONTRACT, start)
-    escrow = get_escrow_address(cli, channel)
-    dst_adr = ibc.chainmain.cosmos_cli().address("signer2")
-    expected = get_transfer_source_tokens_topics(dst_adr, amount, contract, escrow)
-    assert len(logs) == len(expected)
-    height = logs[0]["blockNumber"]
-    assert_duplicate(ibc.cronos.base_port(0), height)
-    for i, log in enumerate(logs):
-        method_name, args = get_topic_data(w3, method_map, contract_info, log)
-        assert args == AttributeDict(expected[i]), [i, method_name]
+    assert_transfer_source_tokens_topics(ibc, cronos_transfer_source_tokens_with_proxy)

integration_tests/utils.py

@@ -687,15 +687,19 @@ def submit_any_proposal(cronos, tmp_path):
     assert grant_detail["grantee"] == grantee_addr
 
 
-def get_method_map(contract_info):
+def get_method_map(contract_info, by_name=False):
     method_map = {}
     for item in contract_info:
         if item["type"] != "event":
             continue
         event_abi = find_matching_event_abi(contract_info, item["name"])
         signature = abi_to_signature(event_abi)
         key = f"0x{abi.event_signature_to_log_topic(signature).hex()}"
-        method_map[key] = signature
+        if by_name:
+            name = signature.split("(")[0]
+            method_map[name] = key
+        else:
+            method_map[key] = signature
     return method_map
 
 

versiondb/client/verify.go

@@ -231,7 +231,6 @@ func verifyOneStore(tree *memiavl.Tree, store, changeSetDir, saveSnapshot string
 
 			return err
 		})
-
 		if err != nil {
 			break
 		}