feat: IBCv2 timeout handler

Author: kulikthebird

x/wasm/keeper/ibc2.go

@@ -73,6 +73,15 @@ func (module IBC2Handler) OnTimeoutPacket(
 	payload channeltypesv2.Payload,
 	relayer sdk.AccAddress,
 ) error {
+	contractAddr, err := ContractFromPortID2(payload.SourcePort)
+	if err != nil {
+		return errorsmod.Wrapf(err, "contract port id")
+	}
+	msg := wasmvmtypes.IBC2PacketTimeoutMsg{Payload: newIBC2Payload(payload), Relayer: relayer.String()}
+	err = module.keeper.OnTimeoutPacket(ctx, contractAddr, msg)
+	if err != nil {
+		return errorsmod.Wrap(err, "on timeout")
+	}
 	return nil
 }
 
@@ -165,6 +174,41 @@ func (k Keeper) OnRecvIBC2Packet(
 	}
 }
 
+// OnTimeoutPacket calls the contract to let it know the packet was never received on the destination chain within
+// the timeout boundaries.
+// The contract should handle this on the application level and undo the original operation
+func (k Keeper) OnTimeoutIBC2Packet(
+	ctx sdk.Context,
+	contractAddr sdk.AccAddress,
+	msg wasmvmtypes.IBC2PacketTimeoutMsg,
+) error {
+	defer telemetry.MeasureSince(time.Now(), "wasm", "contract", "ibc-timeout-packet")
+
+	contractInfo, codeInfo, prefixStore, err := k.contractInstance(ctx, contractAddr)
+	if err != nil {
+		return err
+	}
+
+	env := types.NewEnv(ctx, contractAddr)
+	querier := k.newQueryHandler(ctx, contractAddr)
+
+	gasLeft := k.runtimeGasForContract(ctx)
+	res, gasUsed, execErr := k.wasmVM.IBC2PacketTimeout(codeInfo.CodeHash, env, msg, prefixStore, cosmwasmAPI, querier, ctx.GasMeter(), gasLeft, costJSONDeserialization)
+	k.consumeRuntimeGas(ctx, gasUsed)
+	if execErr != nil {
+		return errorsmod.Wrap(types.ErrExecuteFailed, execErr.Error())
+	}
+	if res == nil {
+		// If this gets executed, that's a bug in wasmvm
+		return errorsmod.Wrap(types.ErrVMError, "internal wasmvm error")
+	}
+	if res.Err != "" {
+		return types.MarkErrorDeterministic(errorsmod.Wrap(types.ErrExecuteFailed, res.Err))
+	}
+
+	return k.handleIBCBasicContractResponse(ctx, contractAddr, contractInfo.IBCPortID, res.Ok)
+}
+
 func newIBC2Payload(payload channeltypesv2.Payload) wasmvmtypes.IBC2Payload {
 	return wasmvmtypes.IBC2Payload{
 		SourcePort:      payload.SourcePort,

x/wasm/types/exported_keepers.go

@@ -146,4 +146,9 @@ type IBC2ContractKeeper interface {
 		contractAddr sdk.AccAddress,
 		msg wasmvmtypes.IBC2PacketReceiveMsg,
 	) channeltypesv2.RecvPacketResult
+	OnTimeoutIBC2Packet(
+		ctx sdk.Context,
+		contractAddr sdk.AccAddress,
+		msg wasmvmtypes.IBC2PacketReceiveMsg,
+	) channeltypesv2.RecvPacketResult
 }