Emit channel close event on ordered channel close (backport #1464) (#…

…1474)

* Emit channel close event on ordered channel close (#1464)

(cherry picked from commit 9ed5ca4)

# Conflicts:
#	CHANGELOG.md

* fix conflict

Co-authored-by: Cian Hatton <cian@interchain.io>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

CHANGELOG.md

@@ -50,6 +50,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (modules/core/04-channel) [\#1160](https://github.com/cosmos/ibc-go/pull/1160) Improve `uint64 -> string` performance in `Logger`.
 * (modules/core/keeper) [\#1284](https://github.com/cosmos/ibc-go/pull/1284) Add sanity check for the keepers passed into `ibckeeper.NewKeeper`. `ibckeeper.NewKeeper` now panics if any of the keepers passed in is empty.
 * (transfer) [\#1414](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnRecvPacket` and `OnAcknowledgementPacket`.
+* (modules/core/04-channel) [\#1464](https://github.com/cosmos/ibc-go/pull/1464) Emit a channel close event when an ordered channel is closed.
 
 ### Features
 

modules/core/04-channel/keeper/events.go

@@ -137,3 +137,18 @@ func EmitTimeoutPacketEvent(ctx sdk.Context, packet exported.PacketI, channel ty
  ),
  })
 }
+
+// EmitChannelClosedEvent emits a channel closed event.
+func EmitChannelClosedEvent(ctx sdk.Context, packet exported.PacketI, channel types.Channel) {
+ ctx.EventManager().EmitEvents(sdk.Events{
+ sdk.NewEvent(
+ types.EventTypeChannelClosed,
+ sdk.NewAttribute(types.AttributeKeyPortID, packet.GetSourcePort()),
+ sdk.NewAttribute(types.AttributeKeyChannelID, packet.GetSourceChannel()),
+ sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
+ sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
+ sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
+ sdk.NewAttribute(types.AttributeKeyChannelOrdering, channel.Ordering.String()),
+ ),
+ })
+}

modules/core/04-channel/keeper/timeout.go

@@ -169,6 +169,10 @@ func (k Keeper) TimeoutExecuted(
  // emit an event marking that we have processed the timeout
  EmitTimeoutPacketEvent(ctx, packet, channel)
 
+ if channel.Ordering == types.ORDERED && channel.State == types.CLOSED {
+ EmitChannelClosedEvent(ctx, packet, channel)
+ }
+
  return nil
 }
 

modules/core/04-channel/types/events.go

@@ -47,6 +47,7 @@ var (
  EventTypeChannelOpenConfirm = "channel_open_confirm"
  EventTypeChannelCloseInit = "channel_close_init"
  EventTypeChannelCloseConfirm = "channel_close_confirm"
+ EventTypeChannelClosed = "channel_close"
 
  AttributeValueCategory = fmt.Sprintf("%s_%s", host.ModuleName, SubModuleName)
 )