Abstract Height in IBC Clients

proto/ibc/channel/channel.proto

@@ -22,8 +22,9 @@ message MsgChannelOpenTry {
   Channel channel              = 3 [(gogoproto.nullable) = false];
   string  counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
   bytes   proof_init           = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""];
-  uint64  proof_height         = 6 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes   signer               = 7 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64  proof_epoch          = 6 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64  proof_height         = 7 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes   signer               = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
@@ -33,8 +34,9 @@ message MsgChannelOpenAck {
   string channel_id           = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
   string counterparty_version = 3 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
   bytes  proof_try            = 4 [(gogoproto.moretags) = "yaml:\"proof_try\""];
-  uint64 proof_height         = 5 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes  signer               = 6 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64 proof_epoch          = 5 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height         = 6 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes  signer               = 7 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain B to acknowledge
@@ -43,8 +45,9 @@ message MsgChannelOpenConfirm {
   string port_id      = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
   string channel_id   = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
   bytes  proof_ack    = 3 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
-  uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes  signer       = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64 proof_epoch  = 4 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height = 5 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes  signer       = 6 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain A
@@ -61,34 +64,38 @@ message MsgChannelCloseConfirm {
   string port_id      = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
   string channel_id   = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
   bytes  proof_init   = 3 [(gogoproto.moretags) = "yaml:\"proof_init\""];
-  uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes  signer       = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64 proof_epoch  = 4 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height = 5 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes  signer       = 6 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // MsgRecvPacket receives incoming IBC packet
 message MsgRecvPacket {
   Packet packet       = 1 [(gogoproto.nullable) = false];
   bytes  proof        = 2;
-  uint64 proof_height = 3 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes  signer       = 4 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64 proof_epoch  = 3 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes  signer       = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // MsgTimeout receives timed-out packet
 message MsgTimeout {
   Packet packet             = 1 [(gogoproto.nullable) = false];
   bytes  proof              = 2;
-  uint64 proof_height       = 3 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  uint64 next_sequence_recv = 4 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
-  bytes  signer             = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64 proof_epoch        = 3 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height       = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  uint64 next_sequence_recv = 5 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""];
+  bytes  signer             = 6 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // MsgAcknowledgement receives incoming IBC acknowledgement
 message MsgAcknowledgement {
   Packet packet          = 1 [(gogoproto.nullable) = false];
   bytes  acknowledgement = 2;
   bytes  proof           = 3;
-  uint64 proof_height    = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes  signer          = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  uint64 proof_epoch     = 4 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height    = 5 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes  signer          = 6 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
 // Channel defines pipeline for exactly-once packet delivery between specific
@@ -190,10 +197,12 @@ message Packet {
   string destination_channel = 5 [(gogoproto.moretags) = "yaml:\"destination_channel\""];
   // actual opaque bytes transferred directly to the application module
   bytes data = 6;
+  // block epoch on which packet times out
+  uint64 timeout_epoch = 7 [(gogoproto.moretags) = "yaml:\"timeout_epoch\""];
   // block height after which the packet times out
-  uint64 timeout_height = 7 [(gogoproto.moretags) = "yaml:\"timeout_height\""];
+  uint64 timeout_height = 8 [(gogoproto.moretags) = "yaml:\"timeout_height\""];
   // block timestamp (in nanoseconds) after which the packet times out
-  uint64 timeout_timestamp = 8 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+  uint64 timeout_timestamp = 9 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
 }
 
 // PacketAckCommitment defines the genesis type necessary to retrieve and store

proto/ibc/connection/connection.proto

@@ -39,12 +39,14 @@ message MsgConnectionOpenTry {
   // proof of the initialization the connection on Chain A: `UNITIALIZED ->
   // INIT`
   bytes proof_init = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""];
-  uint64 proof_height = 6;
+  uint64 proof_epoch  = 6 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height = 7 [(gogoproto.moretags) = "yaml:\"proof_height\""];
   // proof of client consensus state
-  bytes proof_consensus = 7 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
-  uint64 consensus_height = 8
+  bytes proof_consensus = 8 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
+  uint64 consensus_epoch = 9 [(gogoproto.moretags) = "yaml:\"consensus_epoch\""];
+  uint64 consensus_height = 10
       [(gogoproto.moretags) = "yaml:\"consensus_height\""];
-  bytes signer = 9
+  bytes signer = 11
       [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
@@ -59,12 +61,14 @@ message MsgConnectionOpenAck {
   // proof of the initialization the connection on Chain B: `UNITIALIZED ->
   // TRYOPEN`
   bytes proof_try = 3 [(gogoproto.moretags) = "yaml:\"proof_try\""];
-  uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  uint64 proof_epoch = 4 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height = 5 [(gogoproto.moretags) = "yaml:\"proof_height\""];
   // proof of client consensus state
-  bytes proof_consensus = 5 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
-  uint64 consensus_height = 6
+  bytes proof_consensus = 6 [(gogoproto.moretags) = "yaml:\"proof_consensus\""];
+  uint64 consensus_epoch = 7 [(gogoproto.moretags) = "yaml:\"consensus_epoch\""];
+  uint64 consensus_height = 8
       [(gogoproto.moretags) = "yaml:\"consensus_height\""];
-  bytes signer = 7
+  bytes signer = 9
       [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 
@@ -77,8 +81,9 @@ message MsgConnectionOpenConfirm {
   ];
   // proof for the change of the connection state on Chain A: `INIT -> OPEN`
   bytes proof_ack = 2 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
-  uint64 proof_height = 3 [(gogoproto.moretags) = "yaml:\"proof_height\""];
-  bytes signer = 4
+  uint64 proof_epoch  = 3 [(gogoproto.moretags) = "yaml:\"proof_epoch\""];
+  uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
+  bytes signer = 5
       [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
 }
 

proto/ibc/transfer/transfer.proto

@@ -28,12 +28,14 @@ message MsgTransfer {
   ];
   // the recipient address on the destination chain
   string receiver = 5;
+  // Timeout epoch is epoch in which timeout occurs
+  uint64 timeout_epoch = 6 [(gogoproto.moretags) = "yaml:\"timeout_epoch\""];
   // Timeout height relative to the current block height.
   // The timeout is disabled when set to 0.
-  uint64 timeout_height = 6 [(gogoproto.moretags) = "yaml:\"timeout_height\""];
+  uint64 timeout_height = 7 [(gogoproto.moretags) = "yaml:\"timeout_height\""];
   // Timeout timestamp (in nanoseconds) relative to the current block timestamp.
   // The timeout is disabled when set to 0.
-  uint64 timeout_timestamp = 7 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
+  uint64 timeout_timestamp = 8 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""];
 }
 
 // FungibleTokenPacketData defines a struct for the packet payload

x/ibc-transfer/client/cli/tx.go

@@ -16,6 +16,7 @@ import (
 )
 
 const (
+	flagTimeoutEpoch     = "timeout-epoch"
 	flagTimeoutHeight    = "timeout-height"
 	flagTimeoutTimestamp = "timeout-timestamp"
 	flagAbsoluteTimeouts = "absolute-timeouts"
@@ -54,6 +55,11 @@ to the counterparty channel. Any timeout set to 0 is disabled.`),
 				return err
 			}
 
+			timeoutEpoch, err := cmd.Flags().GetUint64(flagTimeoutEpoch)
+			if err != nil {
+				return err
+			}
+
 			timeoutTimestamp, err := cmd.Flags().GetUint64(flagTimeoutHeight)
 			if err != nil {
 				return err
@@ -72,8 +78,13 @@ to the counterparty channel. Any timeout set to 0 is disabled.`),
 					return err
 				}
 
+				// If timeoutEpoch is not specified, use same epoch as latest consensus state
+				if timeoutEpoch != 0 {
+					timeoutEpoch = consensusState.GetHeight().EpochNumber
+				}
+
 				if timeoutHeight != 0 {
-					timeoutHeight = consensusState.GetHeight() + timeoutHeight
+					timeoutHeight = consensusState.GetHeight().EpochHeight + timeoutHeight
 				}
 
 				if timeoutTimestamp != 0 {
@@ -82,7 +93,7 @@ to the counterparty channel. Any timeout set to 0 is disabled.`),
 			}
 
 			msg := types.NewMsgTransfer(
-				srcPort, srcChannel, coins, sender, receiver, timeoutHeight, timeoutTimestamp,
+				srcPort, srcChannel, coins, sender, receiver, timeoutEpoch, timeoutHeight, timeoutTimestamp,
 			)
 			if err := msg.ValidateBasic(); err != nil {
 				return err
@@ -92,6 +103,7 @@ to the counterparty channel. Any timeout set to 0 is disabled.`),
 		},
 	}
 
+	cmd.Flags().Uint64(flagTimeoutEpoch, 0, "Absolute timeout block epoch.")
 	cmd.Flags().Uint64(flagTimeoutHeight, types.DefaultRelativePacketTimeoutHeight, "Timeout block height. The timeout is disabled when set to 0.")
 	cmd.Flags().Uint64(flagTimeoutTimestamp, types.DefaultRelativePacketTimeoutTimestamp, "Timeout timestamp in nanoseconds. Default is 10 minutes. The timeout is disabled when set to 0.")
 	cmd.Flags().Bool(flagAbsoluteTimeouts, false, "Timeout flags are used as absolute timeouts.")

x/ibc-transfer/client/rest/rest.go

@@ -23,6 +23,7 @@ type TransferTxReq struct {
 	BaseReq          rest.BaseReq `json:"base_req" yaml:"base_req"`
 	Amount           sdk.Coins    `json:"amount" yaml:"amount"`
 	Receiver         string       `json:"receiver" yaml:"receiver"`
+	TimeoutEpoch     uint64       `json:"timeout_epoch" yaml:"timeout_epoch"`
 	TimeoutHeight    uint64       `json:"timeout_height" yaml:"timeout_height"`
 	TimeoutTimestamp uint64       `json:"timeout_timestamp" yaml:"timeout_timestamp"`
 }

x/ibc-transfer/client/rest/tx.go

@@ -59,6 +59,7 @@ func transferHandlerFn(clientCtx client.Context) http.HandlerFunc {
 			req.Amount,
 			fromAddr,
 			req.Receiver,
+			req.TimeoutEpoch,
 			req.TimeoutHeight,
 			req.TimeoutTimestamp,
 		)

x/ibc-transfer/handler.go

@@ -24,7 +24,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
 // See createOutgoingPacket in spec:https://github.com/cosmos/ics/tree/master/spec/ics-020-fungible-token-transfer#packet-relay
 func handleMsgTransfer(ctx sdk.Context, k keeper.Keeper, msg *types.MsgTransfer) (*sdk.Result, error) {
 	if err := k.SendTransfer(
-		ctx, msg.SourcePort, msg.SourceChannel, msg.Amount, msg.Sender, msg.Receiver, msg.TimeoutHeight, msg.TimeoutTimestamp,
+		ctx, msg.SourcePort, msg.SourceChannel, msg.Amount, msg.Sender, msg.Receiver, msg.TimeoutEpoch, msg.TimeoutHeight, msg.TimeoutTimestamp,
 	); err != nil {
 		return nil, err
 	}

x/ibc-transfer/handler_test.go

@@ -17,6 +17,7 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	transfer "github.com/cosmos/cosmos-sdk/x/ibc-transfer"
 	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	clientexported "github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported"
 	connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
@@ -79,7 +80,7 @@ func (suite *HandlerTestSuite) TestHandleMsgTransfer() {
 	suite.Require().Nil(err, "transfer module could not claim capability")
 
 	ctx := suite.chainA.GetContext()
-	msg := types.NewMsgTransfer(testPort1, testChannel1, testPrefixedCoins2, testAddr1, testAddr2.String(), 110, 0)
+	msg := types.NewMsgTransfer(testPort1, testChannel1, testPrefixedCoins2, testAddr1, testAddr2.String(), 3, 110, 0)
 	res, err := handler(ctx, msg)
 	suite.Require().Error(err)
 	suite.Require().Nil(res, "%+v", res) // channel does not exist
@@ -105,14 +106,14 @@ func (suite *HandlerTestSuite) TestHandleMsgTransfer() {
 	suite.Require().NotNil(res, "%+v", res) // successfully executed
 
 	// test when the source is false
-	msg = types.NewMsgTransfer(testPort1, testChannel1, testPrefixedCoins2, testAddr1, testAddr2.String(), 110, 0)
+	msg = types.NewMsgTransfer(testPort1, testChannel1, testPrefixedCoins2, testAddr1, testAddr2.String(), 3, 110, 0)
 	_ = suite.chainA.App.BankKeeper.SetBalances(ctx, testAddr1, testPrefixedCoins2)
 
 	res, err = handler(ctx, msg)
 	suite.Require().Error(err)
 	suite.Require().Nil(res, "%+v", res) // incorrect denom prefix
 
-	msg = types.NewMsgTransfer(testPort1, testChannel1, testPrefixedCoins1, testAddr1, testAddr2.String(), 110, 0)
+	msg = types.NewMsgTransfer(testPort1, testChannel1, testPrefixedCoins1, testAddr1, testAddr2.String(), 3, 110, 0)
 	suite.chainA.App.BankKeeper.SetSupply(ctx, banktypes.NewSupply(testPrefixedCoins1))
 	_ = suite.chainA.App.BankKeeper.SetBalances(ctx, testAddr1, testPrefixedCoins1)
 
@@ -146,7 +147,8 @@ func NewTestChain(clientID string) *TestChain {
 	signers := []tmtypes.PrivValidator{privVal}
 	now := time.Date(2020, 1, 2, 0, 0, 0, 0, time.UTC)
 
-	header := ibctmtypes.CreateTestHeader(clientID, 1, now, valSet, signers)
+	height := clientexported.NewHeight(0, 1)
+	header := ibctmtypes.CreateTestHeader(clientID, height, now, valSet, signers)
 
 	return &TestChain{
 		ClientID: clientID,
@@ -248,15 +250,16 @@ func (chain *TestChain) updateClient(client *TestChain) {
 	}
 	client.App.StakingKeeper.SetHistoricalInfo(ctxClient, client.Header.SignedHeader.Header.Height, histInfo)
 
+	height := clientexported.NewHeight(0, uint64(client.Header.SignedHeader.Header.Height))
 	consensusState := ibctmtypes.ConsensusState{
-		Height:       uint64(client.Header.SignedHeader.Header.Height),
+		Height:       height,
 		Timestamp:    client.Header.Time,
 		Root:         commitmenttypes.NewMerkleRoot(commitID.Hash),
 		ValidatorSet: client.Vals,
 	}
 
 	chain.App.IBCKeeper.ClientKeeper.SetClientConsensusState(
-		ctxTarget, client.ClientID, uint64(client.Header.SignedHeader.Header.Height), consensusState,
+		ctxTarget, client.ClientID, height, consensusState,
 	)
 	chain.App.IBCKeeper.ClientKeeper.SetClientState(
 		ctxTarget, ibctmtypes.NewClientState(client.ClientID, lite.DefaultTrustLevel, trustingPeriod, ubdPeriod, maxClockDrift, client.Header, commitmenttypes.GetSDKSpecs()),
@@ -306,6 +309,7 @@ func (chain *TestChain) createChannel(
 }
 
 func nextHeader(chain *TestChain) ibctmtypes.Header {
-	return ibctmtypes.CreateTestHeader(chain.Header.SignedHeader.Header.ChainID, chain.Header.SignedHeader.Header.Height+1,
+	height := clientexported.NewHeight(0, uint64(chain.Header.SignedHeader.Header.Height+1))
+	return ibctmtypes.CreateTestHeader(chain.Header.SignedHeader.Header.ChainID, height,
 		chain.Header.Time.Add(time.Minute), chain.Vals, chain.Signers)
 }

x/ibc-transfer/keeper/keeper_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/ibc-transfer/types"
+	clientexported "github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported"
 	connectiontypes "github.com/cosmos/cosmos-sdk/x/ibc/03-connection/types"
 	channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types"
 	ibctmtypes "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"
@@ -121,7 +122,8 @@ func NewTestChain(clientID string) *TestChain {
 	signers := []tmtypes.PrivValidator{privVal}
 	now := time.Date(2020, 1, 2, 0, 0, 0, 0, time.UTC)
 
-	header := ibctmtypes.CreateTestHeader(clientID, 1, now, valSet, signers)
+	height := clientexported.NewHeight(0, 1)
+	header := ibctmtypes.CreateTestHeader(clientID, height, now, valSet, signers)
 
 	return &TestChain{
 		ClientID: clientID,
@@ -280,6 +282,7 @@ func (chain *TestChain) createChannel(
 }
 
 func nextHeader(chain *TestChain) ibctmtypes.Header {
-	return ibctmtypes.CreateTestHeader(chain.Header.SignedHeader.Header.ChainID, chain.Header.SignedHeader.Header.Height+1,
+	height := clientexported.NewHeight(0, uint64(chain.Header.SignedHeader.Header.Height+1))
+	return ibctmtypes.CreateTestHeader(chain.Header.SignedHeader.Header.ChainID, height,
 		chain.Header.Time.Add(time.Minute), chain.Vals, chain.Signers)
 }

x/ibc-transfer/keeper/relay.go

@@ -27,6 +27,7 @@ func (k Keeper) SendTransfer(
 	amount sdk.Coins,
 	sender sdk.AccAddress,
 	receiver string,
+	timeoutEpoch,
 	timeoutHeight,
 	timeoutTimestamp uint64,
 ) error {
@@ -49,7 +50,7 @@ func (k Keeper) SendTransfer(
 
 	return k.createOutgoingPacket(
 		ctx, sequence, sourcePort, sourceChannel, destinationPort, destinationChannel,
-		amount, sender, receiver, timeoutHeight, timeoutTimestamp,
+		amount, sender, receiver, timeoutEpoch, timeoutHeight, timeoutTimestamp,
 	)
 }
 
@@ -62,7 +63,7 @@ func (k Keeper) createOutgoingPacket(
 	amount sdk.Coins,
 	sender sdk.AccAddress,
 	receiver string,
-	timeoutHeight, timeoutTimestamp uint64,
+	timeoutEpoch, timeoutHeight, timeoutTimestamp uint64,
 ) error {
 	channelCap, ok := k.scopedKeeper.GetCapability(ctx, host.ChannelCapabilityPath(sourcePort, sourceChannel))
 	if !ok {
@@ -141,6 +142,7 @@ func (k Keeper) createOutgoingPacket(
 		sourceChannel,
 		destinationPort,
 		destinationChannel,
+		timeoutEpoch,
 		timeoutHeight,
 		timeoutTimestamp,
 	)