ChanUpgradeTimeout msg_server function

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

@@ -246,19 +246,6 @@ func (im IBCMiddleware) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID str
 // OnChanUpgradeRestore implements the IBCModule interface
 func (im IBCMiddleware) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) {}
 
-// OnChanUpgradeTimeout implements the IBCModule interface
-func (im IBCMiddleware) OnChanUpgradeTimeout(
-	ctx sdk.Context,
-	portID, channelID string,
-	counterpartyChannel channeltypes.Channel,
-	prevErrorReceipt channeltypes.ErrorReceipt,
-	proofCounterpartyChannel,
-	proofErrorReceipt []byte,
-	proofHeight ibcexported.Height,
-) error {
-	return im.app.OnChanUpgradeTimeout(ctx, portID, channelID, counterpartyChannel, prevErrorReceipt, proofCounterpartyChannel, proofErrorReceipt, proofHeight)
-}
-
 // SendPacket implements the ICS4 Wrapper interface
 func (im IBCMiddleware) SendPacket(
 	ctx sdk.Context,

modules/apps/27-interchain-accounts/host/ibc_module.go

@@ -169,16 +169,3 @@ func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string)
 
 // OnChanUpgradeRestore implements the IBCModule interface
 func (im IBCModule) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) {}
-
-// OnChanUpgradeTimeout implements the IBCModule interface
-func (im IBCModule) OnChanUpgradeTimeout(
-	ctx sdk.Context,
-	portID, channelID string,
-	counterpartyChannel channeltypes.Channel,
-	prevErrorReceipt channeltypes.ErrorReceipt,
-	proofCounterpartyChannel,
-	proofErrorReceipt []byte,
-	proofHeight ibcexported.Height,
-) error {
-	return nil
-}

modules/apps/29-fee/ibc_middleware.go

@@ -345,19 +345,6 @@ func (im IBCMiddleware) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID
 	im.app.OnChanUpgradeRestore(ctx, portID, channelID)
 }
 
-// OnChanUpgradeTimeout implements the IBCModule interface
-func (im IBCMiddleware) OnChanUpgradeTimeout(
-	ctx sdk.Context,
-	portID, channelID string,
-	counterpartyChannel channeltypes.Channel,
-	prevErrorReceipt channeltypes.ErrorReceipt,
-	proofCounterpartyChannel,
-	proofErrorReceipt []byte,
-	proofHeight exported.Height,
-) error {
-	return im.app.OnChanUpgradeTimeout(ctx, portID, channelID, counterpartyChannel, prevErrorReceipt, proofCounterpartyChannel, proofErrorReceipt, proofHeight)
-}
-
 // SendPacket implements the ICS4 Wrapper interface
 func (im IBCMiddleware) SendPacket(
 	ctx sdk.Context,

modules/apps/transfer/ibc_module.go

@@ -317,20 +317,9 @@ func (im IBCModule) OnChanUpgradeAck(ctx sdk.Context, portID, channelID, counter
 }
 
 // OnChanUpgradeOpen implements the IBCModule interface
-func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) {}
+func (im IBCModule) OnChanUpgradeOpen(ctx sdk.Context, portID, channelID string) {
+}
 
 // OnChanUpgradeRestore implements the IBCModule interface
-func (im IBCModule) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) {}
-
-// OnChanUpgradeTimeout implements the IBCModule interface
-func (im IBCModule) OnChanUpgradeTimeout(
-	ctx sdk.Context,
-	portID, channelID string,
-	counterpartyChannel channeltypes.Channel,
-	prevErrorReceipt channeltypes.ErrorReceipt,
-	proofCounterpartyChannel,
-	proofErrorReceipt []byte,
-	proofHeight ibcexported.Height,
-) error {
-	return nil
+func (im IBCModule) OnChanUpgradeRestore(ctx sdk.Context, portID, channelID string) {
 }

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

@@ -35,8 +35,3 @@ func (k Keeper) ValidateUpgradeFields(ctx sdk.Context, proposedUpgrade types.Upg
 func (k Keeper) WriteUpgradeOpenChannel(ctx sdk.Context, portID, channelID string) {
 	k.writeUpgradeOpenChannel(ctx, portID, channelID)
 }
-
-// WriteUpgradeTimeoutChannel is a wrapper around writeUpgradeTimeoutChannel to allow the function to be directly called in tests.
-func (k Keeper) WriteUpgradeTimeoutChannel(ctx sdk.Context, portID, channelID string) error {
-	return k.writeUpgradeTimeoutChannel(ctx, portID, channelID)
-}

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

@@ -449,7 +449,7 @@ func (k Keeper) ChanUpgradeTimeout(
 	// was for a previous sequence by the timeout deadline.
 	upgradeSequence := channel.UpgradeSequence
 	if upgradeSequence < prevErrorReceipt.Sequence {
-		return errorsmod.Wrapf(types.ErrInvalidUpgradeSequence, "previous counterparty error receipt sequence is greater than our current upgrade sequence: %d > %d", prevErrorReceipt.Sequence, upgradeSequence)
+		return errorsmod.Wrapf(types.ErrInvalidUpgradeSequence, "previous counterparty error receipt sequence is greater than or equal to our current upgrade sequence: %d > %d", prevErrorReceipt.Sequence, upgradeSequence)
 	}
 
 	if err := k.connectionKeeper.VerifyChannelUpgradeError(
@@ -466,10 +466,10 @@ func (k Keeper) ChanUpgradeTimeout(
 	return nil
 }
 
-// writeUpgradeTimeoutChannel restores the channel state of an initialising chain in the event that the counterparty chain has passed the timeout set in ChanUpgradeInit to the state before the upgrade was proposed.
+// WriteUpgradeTimeoutChannel restores the channel state of an initialising chain in the event that the counterparty chain has passed the timeout set in ChanUpgradeInit to the state before the upgrade was proposed.
 // Auxiliary upgrade state is also deleted.
 // An event is emitted for the handshake step.
-func (k Keeper) writeUpgradeTimeoutChannel(
+func (k Keeper) WriteUpgradeTimeoutChannel(
 	ctx sdk.Context,
 	portID, channelID string,
 ) error {
@@ -485,9 +485,7 @@ func (k Keeper) writeUpgradeTimeoutChannel(
 		panic(fmt.Sprintf("could not find existing upgrade when cancelling channel upgrade, channelID: %s, portID: %s", channelID, portID))
 	}
 
-	if err := k.AbortUpgrade(ctx, portID, channelID, types.NewUpgradeError(channel.UpgradeSequence, types.ErrUpgradeTimeout)); err != nil {
-		return errorsmod.Wrapf(types.ErrUpgradeRestoreFailed, "err: %v", err)
-	}
+	k.restoreChannel(ctx, portID, channelID, channel)
 
 	k.Logger(ctx).Info("channel state restored", "port-id", portID, "channel-id", channelID)
 	emitChannelUpgradeTimeoutEvent(ctx, portID, channelID, channel, upgrade)

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

@@ -732,7 +732,7 @@ func NewMsgChannelUpgradeTimeout(
 		PortId:               portID,
 		ChannelId:            channelID,
 		CounterpartyChannel:  counterpartyChannel,
-		PreviousErrorReceipt: errorReceipt,
+		PreviousErrorReceipt: &errorReceipt,
 		ProofChannel:         proofChannel,
 		ProofErrorReceipt:    proofErrorReceipt,
 		ProofHeight:          proofHeight,