chore: update send packet api

e2e/tests/core/04-channel/channel_test.go

@@ -31,7 +31,7 @@ func (s *ChannelUpgradeTestSuite) TestChannelUpgrade() {
 	rlyWallet := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount)
 
 	t.Run("channel upgrade init", func(t *testing.T) {
-		upgradeTimeout := channeltypes.NewUpgradeTimeout(clienttypes.NewHeight(0, 10000), 0)
+		upgradeTimeout := channeltypes.NewTimeout(clienttypes.NewHeight(0, 10000), 0)
 		upgradeFields := channeltypes.NewUpgradeFields(channeltypes.UNORDERED, channelA.ConnectionHops, `{"fee_version":"ics29-1","app_version":"ics20-1"}`)
 		msgChanUpgradeInit := channeltypes.NewMsgChannelUpgradeInit(
 			channelA.PortID, channelA.ChannelID, upgradeFields, upgradeTimeout, rlyWallet.FormattedAddress(),

modules/apps/27-interchain-accounts/controller/ibc_middleware.go

@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper"
 	"github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
 	icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
@@ -256,8 +255,7 @@ func (im IBCMiddleware) SendPacket(
 	chanCap *capabilitytypes.Capability,
 	sourcePort string,
 	sourceChannel string,
-	timeoutHeight clienttypes.Height,
-	timeoutTimestamp uint64,
+	timeout channeltypes.Timeout,
 	data []byte,
 ) (uint64, error) {
 	panic("SendPacket not supported for ICA controller module. Please use SendTx")

modules/apps/27-interchain-accounts/controller/keeper/relay.go

@@ -44,7 +44,8 @@ func (k Keeper) sendTx(ctx sdk.Context, connectionID, portID string, icaPacketDa
 		return 0, errorsmod.Wrap(err, "invalid interchain account packet data")
 	}
 
-	sequence, err := k.ics4Wrapper.SendPacket(ctx, chanCap, portID, activeChannelID, clienttypes.ZeroHeight(), timeoutTimestamp, icaPacketData.GetBytes())
+	timeout := channeltypes.NewTimeout(clienttypes.ZeroHeight(), timeoutTimestamp)
+	sequence, err := k.ics4Wrapper.SendPacket(ctx, chanCap, portID, activeChannelID, timeout, icaPacketData.GetBytes())
 	if err != nil {
 		return 0, err
 	}

modules/apps/29-fee/ibc_middleware.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper"
 	"github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v7/modules/core/exported"
@@ -351,11 +350,10 @@ func (im IBCMiddleware) SendPacket(
 	chanCap *capabilitytypes.Capability,
 	sourcePort string,
 	sourceChannel string,
-	timeoutHeight clienttypes.Height,
-	timeoutTimestamp uint64,
+	timeout channeltypes.Timeout,
 	data []byte,
 ) (uint64, error) {
-	return im.keeper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data)
+	return im.keeper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeout, data)
 }
 
 // WriteAcknowledgement implements the ICS4 Wrapper interface

modules/apps/29-fee/keeper/msg_server_test.go

@@ -429,9 +429,10 @@ func (suite *KeeperTestSuite) TestPayPacketFeeAsync() {
 			"packet already timed out",
 			func() {
 				timeoutHeight := clienttypes.GetSelfHeight(suite.chainB.GetContext())
+				timeout := channeltypes.NewTimeout(timeoutHeight, 0)
 
 				// try to incentivize a packet which is timed out
-				sequence, err := suite.path.EndpointA.SendPacket(timeoutHeight, 0, ibctesting.MockPacketData)
+				sequence, err := suite.path.EndpointA.SendPacket(timeout, ibctesting.MockPacketData)
 				suite.Require().NoError(err)
 
 				// need to update chainA's client representing chainB to prove missing ack
@@ -512,9 +513,10 @@ func (suite *KeeperTestSuite) TestPayPacketFeeAsync() {
 			suite.coordinator.Setup(suite.path) // setup channel
 
 			timeoutHeight := clienttypes.NewHeight(clienttypes.ParseChainID(suite.chainB.ChainID), 100)
+			timeout := channeltypes.NewTimeout(timeoutHeight, 0)
 
 			// send a packet to incentivize
-			sequence, err := suite.path.EndpointA.SendPacket(timeoutHeight, 0, ibctesting.MockPacketData)
+			sequence, err := suite.path.EndpointA.SendPacket(timeout, ibctesting.MockPacketData)
 			suite.Require().NoError(err)
 			packetID := channeltypes.NewPacketID(suite.path.EndpointA.ChannelConfig.PortID, suite.path.EndpointA.ChannelID, sequence)
 			packet = channeltypes.NewPacket(ibctesting.MockPacketData, packetID.Sequence, packetID.PortId, packetID.ChannelId, suite.path.EndpointB.ChannelConfig.PortID, suite.path.EndpointB.ChannelID, timeoutHeight, 0)

modules/apps/29-fee/keeper/relay.go

@@ -8,7 +8,6 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 
 	"github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"
-	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 )
@@ -19,11 +18,10 @@ func (k Keeper) SendPacket(
 	chanCap *capabilitytypes.Capability,
 	sourcePort string,
 	sourceChannel string,
-	timeoutHeight clienttypes.Height,
-	timeoutTimestamp uint64,
+	timeout channeltypes.Timeout,
 	data []byte,
 ) (uint64, error) {
-	return k.ics4Wrapper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data)
+	return k.ics4Wrapper.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeout, data)
 }
 
 // WriteAcknowledgement wraps IBC ChannelKeeper's WriteAcknowledgement function

modules/apps/transfer/keeper/relay.go

@@ -134,7 +134,8 @@ func (k Keeper) sendTransfer(
 		fullDenomPath, token.Amount.String(), sender.String(), receiver, memo,
 	)
 
-	sequence, err := k.ics4Wrapper.SendPacket(ctx, channelCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, packetData.GetBytes())
+	timeout := channeltypes.NewTimeout(timeoutHeight, timeoutTimestamp)
+	sequence, err := k.ics4Wrapper.SendPacket(ctx, channelCap, sourcePort, sourceChannel, timeout, packetData.GetBytes())
 	if err != nil {
 		return 0, err
 	}

modules/core/03-connection/keeper/verify_test.go

@@ -341,7 +341,8 @@ func (suite *KeeperTestSuite) TestVerifyPacketCommitment() {
 			path = ibctesting.NewPath(suite.chainA, suite.chainB)
 			suite.coordinator.Setup(path)
 
-			sequence, err := path.EndpointA.SendPacket(defaultTimeoutHeight, 0, ibctesting.MockPacketData)
+			timeout := channeltypes.NewTimeout(defaultTimeoutHeight, 0)
+			sequence, err := path.EndpointA.SendPacket(timeout, ibctesting.MockPacketData)
 			suite.Require().NoError(err)
 			packet = channeltypes.NewPacket(ibctesting.MockPacketData, sequence, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, defaultTimeoutHeight, 0)
 
@@ -435,7 +436,8 @@ func (suite *KeeperTestSuite) TestVerifyPacketAcknowledgement() {
 			suite.coordinator.Setup(path)
 
 			// send and receive packet
-			sequence, err := path.EndpointA.SendPacket(defaultTimeoutHeight, 0, ibctesting.MockPacketData)
+			timeout := channeltypes.NewTimeout(defaultTimeoutHeight, 0)
+			sequence, err := path.EndpointA.SendPacket(timeout, ibctesting.MockPacketData)
 			suite.Require().NoError(err)
 
 			// increment receiving chain's (chainB) time by 2 hour to always pass receive
@@ -540,7 +542,8 @@ func (suite *KeeperTestSuite) TestVerifyPacketReceiptAbsence() {
 			suite.coordinator.Setup(path)
 
 			// send, only receive in malleate if applicable
-			sequence, err := path.EndpointA.SendPacket(defaultTimeoutHeight, 0, ibctesting.MockPacketData)
+			timeout := channeltypes.NewTimeout(defaultTimeoutHeight, 0)
+			sequence, err := path.EndpointA.SendPacket(timeout, ibctesting.MockPacketData)
 			suite.Require().NoError(err)
 			packet = channeltypes.NewPacket(ibctesting.MockPacketData, sequence, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID, defaultTimeoutHeight, 0)
 
@@ -641,7 +644,9 @@ func (suite *KeeperTestSuite) TestVerifyNextSequenceRecv() {
 			suite.coordinator.Setup(path)
 
 			// send and receive packet
-			sequence, err := path.EndpointA.SendPacket(defaultTimeoutHeight, 0, ibctesting.MockPacketData)
+			timeout := channeltypes.NewTimeout(defaultTimeoutHeight, 0)
+
+			sequence, err := path.EndpointA.SendPacket(timeout, ibctesting.MockPacketData)
 			suite.Require().NoError(err)
 
 			// increment receiving chain's (chainB) time by 2 hour to always pass receive
@@ -889,7 +894,7 @@ func (suite *KeeperTestSuite) TestVerifyUpgrade() {
 
 			upgrade = channeltypes.NewUpgrade(
 				channeltypes.NewUpgradeFields(channeltypes.UNORDERED, []string{path.EndpointA.ConnectionID}, "v1.0.0"),
-				channeltypes.NewUpgradeTimeout(clienttypes.ZeroHeight(), 100000),
+				channeltypes.NewTimeout(clienttypes.ZeroHeight(), 100000),
 				0,
 			)
 

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

@@ -1615,7 +1615,7 @@ func (suite *KeeperTestSuite) TestQueryUpgrade() {
 
 			expectedUpgrade = types.NewUpgrade(
 				types.NewUpgradeFields(types.UNORDERED, []string{ibctesting.FirstConnectionID}, mock.Version),
-				types.NewUpgradeTimeout(clienttypes.ZeroHeight(), 1000000),
+				types.NewTimeout(clienttypes.ZeroHeight(), 1000000),
 				1,
 			)
 

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

@@ -24,8 +24,7 @@ func (k Keeper) SendPacket(
 	channelCap *capabilitytypes.Capability,
 	sourcePort string,
 	sourceChannel string,
-	timeoutHeight clienttypes.Height,
-	timeoutTimestamp uint64,
+	timeout types.Timeout,
 	data []byte,
 ) (uint64, error) {
 	channel, found := k.GetChannel(ctx, sourcePort, sourceChannel)
@@ -54,7 +53,7 @@ func (k Keeper) SendPacket(
 
 	// construct packet from given fields and channel state
 	packet := types.NewPacket(data, sequence, sourcePort, sourceChannel,
-		channel.Counterparty.PortId, channel.Counterparty.ChannelId, timeoutHeight, timeoutTimestamp)
+		channel.Counterparty.PortId, channel.Counterparty.ChannelId, timeout.Height, timeout.Timestamp)
 
 	if err := packet.ValidateBasic(); err != nil {
 		return 0, errorsmod.Wrap(err, "constructed packet failed basic validation")
@@ -77,10 +76,15 @@ func (k Keeper) SendPacket(
 
 	// check if packet is timed out on the receiving chain
 	latestHeight := clientState.GetLatestHeight()
-	if !timeoutHeight.IsZero() && latestHeight.GTE(timeoutHeight) {
+	timeoutHeight, ok := latestHeight.(clienttypes.Height)
+	if !ok {
+		return 0, errorsmod.Wrapf(clienttypes.ErrInvalidHeight, "invalid height type %T, expected %T", latestHeight, clienttypes.Height{})
+	}
+
+	if !timeout.IsZeroHeight() && !timeout.AfterHeight(timeoutHeight) {
 		return 0, errorsmod.Wrapf(
 			types.ErrPacketTimeout,
-			"receiving chain block height >= packet timeout height (%s >= %s)", latestHeight, timeoutHeight,
+			"receiving chain block height >= packet timeout height (%s >= %s)", latestHeight, timeout.Height,
 		)
 	}
 
@@ -101,7 +105,7 @@ func (k Keeper) SendPacket(
 	k.SetNextSequenceSend(ctx, sourcePort, sourceChannel, sequence+1)
 	k.SetPacketCommitment(ctx, sourcePort, sourceChannel, packet.GetSequence(), commitment)
 
-	emitSendPacketEvent(ctx, packet, channel, timeoutHeight)
+	emitSendPacketEvent(ctx, packet, channel, timeout.Height)
 
 	k.Logger(ctx).Info(
 		"packet sent",