From 98efdc6e7cbbb81b984b2dc4457f2c28a8aae64b Mon Sep 17 00:00:00 2001 From: mmsqe Date: Wed, 23 Oct 2024 18:23:52 +0800 Subject: [PATCH] cleanup --- integration_tests/test_ibc_rly.py | 16 +++++------ x/cronos/events/event.go | 5 +++- x/cronos/events/events.go | 46 ++++++++++++++++--------------- x/cronos/events/types/types.go | 6 ++-- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/integration_tests/test_ibc_rly.py b/integration_tests/test_ibc_rly.py index 05b989edf7..234944fe38 100644 --- a/integration_tests/test_ibc_rly.py +++ b/integration_tests/test_ibc_rly.py @@ -93,7 +93,7 @@ def coin_spent(spender, amt, denom): def distribute_fee(receiver, fee): return { "receiver": receiver, - "fee": keccak(text=fee), + "fee": fee, } @@ -101,7 +101,7 @@ def fungible(dst, src, amt, denom): return { "receiver": dst, "sender": src, - "denom": keccak(text=denom), + "denom": denom, "amount": amt, } @@ -123,7 +123,7 @@ def burn(burner, amt, denom): def recv_packet(seq, src, dst, amt, denom): return { - "packetSequence": f"{seq}", + "packetSequence": seq, "packetSrcPort": keccak(text="transfer"), "packetSrcChannel": keccak(text=channel), "packetSrcPortInfo": "transfer", @@ -143,7 +143,7 @@ def recv_packet(seq, src, dst, amt, denom): def acknowledge_packet(seq): return { - "packetSequence": f"{seq}", + "packetSequence": seq, "packetSrcPort": keccak(text="transfer"), "packetSrcChannel": keccak(text=channel), "packetSrcPortInfo": "transfer", @@ -156,13 +156,13 @@ def acknowledge_packet(seq): def denom_trace(denom): return { - "denom": keccak(text=denom), + "denom": denom, } def write_ack(seq, src, dst, amt, denom): return { - "packetSequence": f"{seq}", + "packetSequence": seq, "packetSrcPort": keccak(text="transfer"), "packetSrcChannel": keccak(text=channel), "packetSrcPortInfo": "transfer", @@ -226,7 +226,7 @@ def filter_logs_since(w3, start, name, seq): { "fromBlock": start, "address": [CONTRACT], - "topics": [topic, "0x" + keccak(text=f"{seq}").hex()], + "topics": [topic, "0x{:064x}".format(seq)], } ) @@ -244,7 +244,7 @@ def test_ibc(ibc): 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) + seq = int(get_send_packet_seq(chainmain_cli)) expected = [ recv_packet(seq, relayer0, cronos_signer2, src_amount, src_denom), denom_trace(denom), diff --git a/x/cronos/events/event.go b/x/cronos/events/event.go index 0c146b95e2..1dbbdfac91 100644 --- a/x/cronos/events/event.go +++ b/x/cronos/events/event.go @@ -62,12 +62,15 @@ func makeFilter( func (desc *EventDescriptor) ConvertEvent( event []abci.EventAttribute, valueDecoders ValueDecoders, + replaceAttrs map[string]string, ) (*ethtypes.Log, error) { attrs := make(map[string]string, len(event)) for _, attr := range event { attrs[toUnderScore(attr.Key)] = attr.Value } - + for k, v := range replaceAttrs { + attrs[k] = attrs[v] + } filterQuery, err := makeFilter(valueDecoders, attrs, desc.indexed, true) if err != nil { return nil, err diff --git a/x/cronos/events/events.go b/x/cronos/events/events.go index 07e09ff4f7..d41259a21d 100644 --- a/x/cronos/events/events.go +++ b/x/cronos/events/events.go @@ -1,8 +1,6 @@ package events import ( - "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types" @@ -19,24 +17,24 @@ var ( RelayerEvents map[string]*EventDescriptor IcaEvents map[string]*EventDescriptor RelayerValueDecoders = ValueDecoders{ - channeltypes.AttributeKeyDataHex: ConvertPacketData, - transfertypes.AttributeKeyAmount: ConvertAmount, - banktypes.AttributeKeyRecipient: ConvertAccAddressFromBech32, - banktypes.AttributeKeySpender: ConvertAccAddressFromBech32, - banktypes.AttributeKeyReceiver: ConvertAccAddressFromBech32, - banktypes.AttributeKeySender: ConvertAccAddressFromBech32, - banktypes.AttributeKeyMinter: ConvertAccAddressFromBech32, - banktypes.AttributeKeyBurner: ConvertAccAddressFromBech32, - channeltypes.AttributeKeySequence: ConvertUint64, - channeltypes.AttributeKeySrcPort: ReturnStringAsIs, - fmt.Sprintf("%s_info", channeltypes.AttributeKeySrcPort): ReturnStringAsIs, - channeltypes.AttributeKeySrcChannel: ReturnStringAsIs, - fmt.Sprintf("%s_info", channeltypes.AttributeKeySrcChannel): ReturnStringAsIs, - channeltypes.AttributeKeyDstPort: ReturnStringAsIs, - channeltypes.AttributeKeyDstChannel: ReturnStringAsIs, - channeltypes.AttributeKeyConnectionID: ReturnStringAsIs, - ibcfeetypes.AttributeKeyFee: ReturnStringAsIs, - transfertypes.AttributeKeyDenom: ReturnStringAsIs, + channeltypes.AttributeKeyDataHex: ConvertPacketData, + transfertypes.AttributeKeyAmount: ConvertAmount, + banktypes.AttributeKeyRecipient: ConvertAccAddressFromBech32, + banktypes.AttributeKeySpender: ConvertAccAddressFromBech32, + banktypes.AttributeKeyReceiver: ConvertAccAddressFromBech32, + banktypes.AttributeKeySender: ConvertAccAddressFromBech32, + banktypes.AttributeKeyMinter: ConvertAccAddressFromBech32, + banktypes.AttributeKeyBurner: ConvertAccAddressFromBech32, + channeltypes.AttributeKeySequence: ConvertUint64, + channeltypes.AttributeKeySrcPort: ReturnStringAsIs, + cronoseventstypes.AttributeKeySrcPortInfo: ReturnStringAsIs, + channeltypes.AttributeKeySrcChannel: ReturnStringAsIs, + cronoseventstypes.AttributeKeySrcChannelInfo: ReturnStringAsIs, + channeltypes.AttributeKeyDstPort: ReturnStringAsIs, + channeltypes.AttributeKeyDstChannel: ReturnStringAsIs, + channeltypes.AttributeKeyConnectionID: ReturnStringAsIs, + ibcfeetypes.AttributeKeyFee: ReturnStringAsIs, + transfertypes.AttributeKeyDenom: ReturnStringAsIs, } IcaValueDecoders = ValueDecoders{ cronoseventstypes.AttributeKeySeq: ConvertUint64, @@ -63,7 +61,11 @@ func RelayerConvertEvent(event sdk.Event) (*ethtypes.Log, error) { if !ok { return nil, nil } - return desc.ConvertEvent(event.Attributes, RelayerValueDecoders) + replaceAttrs := map[string]string{ + cronoseventstypes.AttributeKeySrcPortInfo: channeltypes.AttributeKeySrcPort, + cronoseventstypes.AttributeKeySrcChannelInfo: channeltypes.AttributeKeySrcChannel, + } + return desc.ConvertEvent(event.Attributes, RelayerValueDecoders, replaceAttrs) } func IcaConvertEvent(event sdk.Event) (*ethtypes.Log, error) { @@ -71,5 +73,5 @@ func IcaConvertEvent(event sdk.Event) (*ethtypes.Log, error) { if !ok { return nil, nil } - return desc.ConvertEvent(event.Attributes, IcaValueDecoders) + return desc.ConvertEvent(event.Attributes, IcaValueDecoders, map[string]string{}) } diff --git a/x/cronos/events/types/types.go b/x/cronos/events/types/types.go index 66ace42d19..ad30073e08 100644 --- a/x/cronos/events/types/types.go +++ b/x/cronos/events/types/types.go @@ -1,6 +1,8 @@ package types const ( - EventTypeSubmitMsgsResult = "submit_msgs_result" - AttributeKeySeq = "seq" + EventTypeSubmitMsgsResult = "submit_msgs_result" + AttributeKeySeq = "seq" + AttributeKeySrcPortInfo = "packet_src_port_info" + AttributeKeySrcChannelInfo = "packet_src_channel_info" )