From d7d25e65988f52aa407de137c96fff1f137ff0fd Mon Sep 17 00:00:00 2001 From: srdtrk <59252793+srdtrk@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:25:59 +0800 Subject: [PATCH] imp: updated events to remove channels (#7874) * imp: updated channel v2 events * fix: removed event --- modules/core/04-channel/v2/keeper/events.go | 20 ++++++------- modules/core/04-channel/v2/types/events.go | 31 +++++++++------------ testing/events.go | 3 +- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/modules/core/04-channel/v2/keeper/events.go b/modules/core/04-channel/v2/keeper/events.go index 33b3f3bc275..5db1229fc14 100644 --- a/modules/core/04-channel/v2/keeper/events.go +++ b/modules/core/04-channel/v2/keeper/events.go @@ -24,8 +24,8 @@ func emitSendPacketEvents(ctx context.Context, packet types.Packet) { sdkCtx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( types.EventTypeSendPacket, - sdk.NewAttribute(types.AttributeKeySrcChannel, packet.SourceClient), - sdk.NewAttribute(types.AttributeKeyDstChannel, packet.DestinationClient), + sdk.NewAttribute(types.AttributeKeySrcClient, packet.SourceClient), + sdk.NewAttribute(types.AttributeKeyDstClient, packet.DestinationClient), sdk.NewAttribute(types.AttributeKeySequence, fmt.Sprintf("%d", packet.Sequence)), sdk.NewAttribute(types.AttributeKeyTimeoutTimestamp, fmt.Sprintf("%d", packet.TimeoutTimestamp)), sdk.NewAttribute(types.AttributeKeyEncodedPacketHex, hex.EncodeToString(encodedPacket)), @@ -49,8 +49,8 @@ func emitRecvPacketEvents(ctx context.Context, packet types.Packet) { sdkCtx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( types.EventTypeRecvPacket, - sdk.NewAttribute(types.AttributeKeySrcChannel, packet.SourceClient), - sdk.NewAttribute(types.AttributeKeyDstChannel, packet.DestinationClient), + sdk.NewAttribute(types.AttributeKeySrcClient, packet.SourceClient), + sdk.NewAttribute(types.AttributeKeyDstClient, packet.DestinationClient), sdk.NewAttribute(types.AttributeKeySequence, fmt.Sprintf("%d", packet.Sequence)), sdk.NewAttribute(types.AttributeKeyTimeoutTimestamp, fmt.Sprintf("%d", packet.TimeoutTimestamp)), sdk.NewAttribute(types.AttributeKeyEncodedPacketHex, hex.EncodeToString(encodedPacket)), @@ -79,8 +79,8 @@ func emitWriteAcknowledgementEvents(ctx context.Context, packet types.Packet, ac sdkCtx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( types.EventTypeWriteAck, - sdk.NewAttribute(types.AttributeKeySrcChannel, packet.SourceClient), - sdk.NewAttribute(types.AttributeKeyDstChannel, packet.DestinationClient), + sdk.NewAttribute(types.AttributeKeySrcClient, packet.SourceClient), + sdk.NewAttribute(types.AttributeKeyDstClient, packet.DestinationClient), sdk.NewAttribute(types.AttributeKeySequence, fmt.Sprintf("%d", packet.Sequence)), sdk.NewAttribute(types.AttributeKeyTimeoutTimestamp, fmt.Sprintf("%d", packet.TimeoutTimestamp)), sdk.NewAttribute(types.AttributeKeyEncodedPacketHex, hex.EncodeToString(encodedPacket)), @@ -105,8 +105,8 @@ func emitAcknowledgePacketEvents(ctx context.Context, packet types.Packet) { sdkCtx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( types.EventTypeAcknowledgePacket, - sdk.NewAttribute(types.AttributeKeySrcChannel, packet.SourceClient), - sdk.NewAttribute(types.AttributeKeyDstChannel, packet.DestinationClient), + sdk.NewAttribute(types.AttributeKeySrcClient, packet.SourceClient), + sdk.NewAttribute(types.AttributeKeyDstClient, packet.DestinationClient), sdk.NewAttribute(types.AttributeKeySequence, fmt.Sprintf("%d", packet.Sequence)), sdk.NewAttribute(types.AttributeKeyTimeoutTimestamp, fmt.Sprintf("%d", packet.TimeoutTimestamp)), sdk.NewAttribute(types.AttributeKeyEncodedPacketHex, hex.EncodeToString(encodedPacket)), @@ -130,8 +130,8 @@ func emitTimeoutPacketEvents(ctx context.Context, packet types.Packet) { sdkCtx.EventManager().EmitEvents(sdk.Events{ sdk.NewEvent( types.EventTypeTimeoutPacket, - sdk.NewAttribute(types.AttributeKeySrcChannel, packet.SourceClient), - sdk.NewAttribute(types.AttributeKeyDstChannel, packet.DestinationClient), + sdk.NewAttribute(types.AttributeKeySrcClient, packet.SourceClient), + sdk.NewAttribute(types.AttributeKeyDstClient, packet.DestinationClient), sdk.NewAttribute(types.AttributeKeySequence, fmt.Sprintf("%d", packet.Sequence)), sdk.NewAttribute(types.AttributeKeyTimeoutTimestamp, fmt.Sprintf("%d", packet.TimeoutTimestamp)), sdk.NewAttribute(types.AttributeKeyEncodedPacketHex, hex.EncodeToString(encodedPacket)), diff --git a/modules/core/04-channel/v2/types/events.go b/modules/core/04-channel/v2/types/events.go index 1ef33d80491..d1d42fdc73a 100644 --- a/modules/core/04-channel/v2/types/events.go +++ b/modules/core/04-channel/v2/types/events.go @@ -6,28 +6,23 @@ import ( ibcexported "github.com/cosmos/ibc-go/v9/modules/core/exported" ) -// IBC channel events +// IBC Eureka core events const ( - EventTypeCreateChannel = "create_channel" - EventTypeRegisterCounterparty = "register_counterparty" - EventTypeSendPacket = "send_packet" - EventTypeRecvPacket = "recv_packet" - EventTypeTimeoutPacket = "timeout_packet" - EventTypeAcknowledgePacket = "acknowledge_packet" - EventTypeWriteAck = "write_acknowledgement" + EventTypeSendPacket = "send_packet" + EventTypeRecvPacket = "recv_packet" + EventTypeTimeoutPacket = "timeout_packet" + EventTypeAcknowledgePacket = "acknowledge_packet" + EventTypeWriteAck = "write_acknowledgement" - AttributeKeyChannelID = "channel_id" - AttributeKeyClientID = "client_id" - AttributeKeyCounterpartyChannelID = "counterparty_channel_id" - AttributeKeySrcChannel = "packet_source_channel" - AttributeKeyDstChannel = "packet_dest_channel" - AttributeKeySequence = "packet_sequence" - AttributeKeyTimeoutTimestamp = "packet_timeout_timestamp" - AttributeKeyEncodedPacketHex = "encoded_packet_hex" - AttributeKeyEncodedAckHex = "encoded_acknowledgement_hex" + AttributeKeySrcClient = "packet_source_client" + AttributeKeyDstClient = "packet_dest_client" + AttributeKeySequence = "packet_sequence" + AttributeKeyTimeoutTimestamp = "packet_timeout_timestamp" + AttributeKeyEncodedPacketHex = "encoded_packet_hex" + AttributeKeyEncodedAckHex = "encoded_acknowledgement_hex" ) -// IBC channel events vars +// IBC Eureka core events vars var ( AttributeValueCategory = fmt.Sprintf("%s_%s", ibcexported.ModuleName, SubModuleName) ) diff --git a/testing/events.go b/testing/events.go index 22f52ffebd2..56426bb34e2 100644 --- a/testing/events.go +++ b/testing/events.go @@ -14,7 +14,6 @@ import ( clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types" connectiontypes "github.com/cosmos/ibc-go/v9/modules/core/03-connection/types" channeltypes "github.com/cosmos/ibc-go/v9/modules/core/04-channel/types" - channeltypesv2 "github.com/cosmos/ibc-go/v9/modules/core/04-channel/v2/types" ) // ParseClientIDFromEvents parses events emitted from a MsgCreateClient and returns the @@ -48,7 +47,7 @@ func ParseConnectionIDFromEvents(events []abci.Event) (string, error) { // MsgChannelOpenTry or a MsgCreateChannel and returns the channel identifier. func ParseChannelIDFromEvents(events []abci.Event) (string, error) { for _, ev := range events { - if ev.Type == channeltypesv2.EventTypeCreateChannel || ev.Type == channeltypes.EventTypeChannelOpenInit || ev.Type == channeltypes.EventTypeChannelOpenTry { + if ev.Type == channeltypes.EventTypeChannelOpenInit || ev.Type == channeltypes.EventTypeChannelOpenTry { if attribute, found := attributeByKey(ev.Attributes, channeltypes.AttributeKeyChannelID); found { return attribute.Value, nil }