imp: updated channel v2 events

cosmos · Jan 24, 2025 · bab1810 · bab1810
1 parent 5412619
commit bab1810
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 28 deletions.
diff --git 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
@@ -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)
 )