Call TimeoutExecuted, add wrappers

cosmos · Feb 3, 2020 · 30a3a46 · 30a3a46
1 parent 3304ffb
commit 30a3a46
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/x/ibc/20-transfer/handler.go b/x/ibc/20-transfer/handler.go
@@ -87,7 +87,6 @@ func handlePacketDataTransfer(
 		),
 	)
 
-	// packet receiving should not fail
 	return &sdk.Result{
 		Events: ctx.EventManager().Events(),
 	}, nil
@@ -96,13 +95,18 @@ func handlePacketDataTransfer(
 // See onTimeoutPacket in spec: https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer#packet-relay
 func handleTimeoutDataTransfer(ctx sdk.Context, k Keeper, msg channeltypes.MsgTimeout, data FungibleTokenPacketData) (*sdk.Result, error) {
 	packet := msg.Packet
-	if err := k.TimeoutTransfer(
-		ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data,
-	); err != nil {
-		return nil, err
+	err := k.TimeoutTransfer(ctx, packet.SourcePort, packet.SourceChannel, packet.DestinationPort, packet.DestinationChannel, data)
+	if err != nil {
+		// TODO: This chain sent invalid packet
+		panic(err)
+	}
+
+	err = k.TimeoutExecuted(ctx, packet)
+	if err != nil {
+		// TODO: This should not happen
+		panic(err)
 	}
 
-	// packet timeout should not fail
 	return &sdk.Result{
 		Events: ctx.EventManager().Events(),
 	}, nil

diff --git a/x/ibc/20-transfer/keeper/keeper.go b/x/ibc/20-transfer/keeper/keeper.go
@@ -64,7 +64,7 @@ func (k Keeper) GetTransferAccount(ctx sdk.Context) supplyexported.ModuleAccount
 }
 
 // PacketExecuted defines a wrapper function for the channel Keeper's function
-// in order to expose it to the ICS20 trasfer handler.
+// in order to expose it to the ICS20 transfer handler.
 func (k Keeper) PacketExecuted(ctx sdk.Context, packet channelexported.PacketI, acknowledgement channelexported.PacketDataI) error {
 	return k.channelKeeper.PacketExecuted(ctx, packet, acknowledgement)
 }
@@ -74,3 +74,9 @@ func (k Keeper) PacketExecuted(ctx sdk.Context, packet channelexported.PacketI,
 func (k Keeper) ChanCloseInit(ctx sdk.Context, portID, channelID string) error {
 	return k.channelKeeper.ChanCloseInit(ctx, portID, channelID)
 }
+
+// TimeoutExecuted defines a wrapper function for the channel Keeper's function
+// in order to expose it to the ICS20 transfer handler.
+func (k Keeper) TimeoutExecuted(ctx sdk.Context, packet channelexported.PacketI) error {
+	return k.channelKeeper.TimeoutExecuted(ctx, packet)
+}
diff --git a/x/ibc/20-transfer/types/expected_keepers.go b/x/ibc/20-transfer/types/expected_keepers.go
@@ -21,6 +21,7 @@ type ChannelKeeper interface {
 	SendPacket(ctx sdk.Context, packet channelexported.PacketI) error
 	PacketExecuted(ctx sdk.Context, packet channelexported.PacketI, acknowledgement channelexported.PacketDataI) error
 	ChanCloseInit(ctx sdk.Context, portID, channelID string) error
+	TimeoutExecuted(ctx sdk.Context, packet channelexported.PacketI) error
 }
 
 // ClientKeeper defines the expected IBC client keeper