fix: Remove unused IBC msg handler - IBCv2 msgs are translated by encoders and handled by Cosmos SDK

Author: kulikthebird

app/app.go

@@ -594,7 +594,6 @@ func NewWasmApp(
 		distrkeeper.NewQuerier(app.DistrKeeper),
 		app.IBCKeeper.ChannelKeeper,
 		app.IBCKeeper.ChannelKeeper,
-		app.IBCKeeper.ChannelKeeperV2,
 		app.TransferKeeper,
 		app.MsgServiceRouter(),
 		app.GRPCQueryRouter(),

x/wasm/keeper/genesis_test.go

@@ -695,7 +695,6 @@ func setupKeeper(t *testing.T) (*Keeper, sdk.Context) {
 		nil,
 		nil,
 		nil,
-		nil,
 		tempDir,
 		nodeConfig,
 		wasmtypes.VMConfig{},

x/wasm/keeper/handler_plugin.go

@@ -3,10 +3,8 @@ package keeper
 import (
 	"errors"
 	"fmt"
-	"time"
 
 	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
-	channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -42,7 +40,6 @@ func NewDefaultMessageHandler(
 	keeper *Keeper,
 	router MessageRouter,
 	ics4Wrapper types.ICS4Wrapper,
-	channelKeeperV2 types.ChannelKeeperV2,
 	bankKeeper types.Burner,
 	cdc codec.Codec,
 	portSource types.ICS20TransferPortSource,
@@ -55,7 +52,6 @@ func NewDefaultMessageHandler(
 	return NewMessageHandlerChain(
 		NewSDKMessageHandler(cdc, router, encoders),
 		NewIBCRawPacketHandler(ics4Wrapper, keeper),
-		NewIBC2RawPacketHandler(channelKeeperV2),
 		NewBurnCoinMessageHandler(bankKeeper),
 	)
 }
@@ -262,75 +258,6 @@ func (h IBCRawPacketHandler) DispatchMsg(ctx sdk.Context, _ sdk.AccAddress, cont
 	}
 }
 
-// IBC2RawPacketHandler handles IBC2Msg received from CosmWasm.
-type IBC2RawPacketHandler struct {
-	channelKeeperV2 types.ChannelKeeperV2
-}
-
-// NewIBCRawPacketHandler constructor
-func NewIBC2RawPacketHandler(channelKeeperV2 types.ChannelKeeperV2) IBC2RawPacketHandler {
-	return IBC2RawPacketHandler{
-		channelKeeperV2: channelKeeperV2,
-	}
-}
-
-// DispatchMsg publishes a raw IBC2 packet onto the channel.
-func (h IBC2RawPacketHandler) DispatchMsg(ctx sdk.Context,
-	contractAddr sdk.AccAddress, contractIBC2PortID string, msg wasmvmtypes.CosmosMsg,
-) ([]sdk.Event, [][]byte, [][]*codectypes.Any, error) {
-	if msg.IBC2 == nil {
-		return nil, nil, nil, types.ErrUnknownMsg
-	}
-	switch {
-	case msg.IBC2.SendPacket != nil:
-		if contractIBC2PortID == "" {
-			return nil, nil, nil, errorsmod.Wrapf(types.ErrUnsupportedForContract, "ibc2 not supported")
-		}
-		contractIBCChannelID := msg.IBC2.SendPacket.ChannelID
-		if contractIBCChannelID == "" {
-			return nil, nil, nil, errorsmod.Wrapf(types.ErrEmpty, "ibc2 channel")
-		}
-
-		var payloads []channeltypesv2.Payload
-		for _, payload := range msg.IBC2.SendPacket.Payloads {
-			payloads = append(payloads, channeltypesv2.Payload{
-				SourcePort:      payload.SourcePort,
-				DestinationPort: payload.DestinationPort,
-				Version:         payload.Version,
-				Encoding:        payload.Encoding,
-				Value:           payload.Value,
-			})
-		}
-		ibcGoMsg := &channeltypesv2.MsgSendPacket{
-			SourceClient:     msg.IBC2.SendPacket.ChannelID,
-			TimeoutTimestamp: uint64(time.Unix(0, int64(msg.IBC2.SendPacket.Timeout)).Unix()),
-			Payloads:         payloads,
-			Signer:           contractAddr.String(),
-		}
-
-		ibcGoResp, err := h.channelKeeperV2.SendPacket(ctx, ibcGoMsg)
-		if err != nil {
-			return nil, nil, nil, errorsmod.Wrap(err, "channel")
-		}
-		moduleLogger(ctx).Debug("ibc2 packet set", "seq", ibcGoResp.Sequence)
-
-		resp := &types.MsgIBCSendResponse{Sequence: ibcGoResp.Sequence}
-		val, err := resp.Marshal()
-		if err != nil {
-			return nil, nil, nil, errorsmod.Wrap(err, "failed to marshal IBC2 send response")
-		}
-		any, err := codectypes.NewAnyWithValue(resp)
-		if err != nil {
-			return nil, nil, nil, errorsmod.Wrap(err, "failed to convert IBC2 send response to Any")
-		}
-		msgResponses := [][]*codectypes.Any{{any}}
-
-		return nil, [][]byte{val}, msgResponses, nil
-	default:
-		return nil, nil, nil, types.ErrUnknownMsg
-	}
-}
-
 var _ Messenger = MessageHandlerFunc(nil)
 
 // MessageHandlerFunc is a helper to construct a function based message handler.

x/wasm/keeper/keeper_cgo.go

@@ -28,7 +28,6 @@ func NewKeeper(
 	distrKeeper types.DistributionKeeper,
 	ics4Wrapper types.ICS4Wrapper,
 	channelKeeper types.ChannelKeeper,
-	channelKeeperV2 types.ChannelKeeperV2,
 	portSource types.ICS20TransferPortSource,
 	router MessageRouter,
 	_ GRPCQueryRouter,
@@ -61,7 +60,7 @@ func NewKeeper(
 		wasmLimits:  vmConfig.WasmLimits,
 		ibcRouterV2: ibcRouterV2,
 	}
-	keeper.messenger = NewDefaultMessageHandler(keeper, router, ics4Wrapper, channelKeeperV2, bankKeeper, cdc, portSource)
+	keeper.messenger = NewDefaultMessageHandler(keeper, router, ics4Wrapper, bankKeeper, cdc, portSource)
 	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distrKeeper, channelKeeper, keeper)
 	preOpts, postOpts := splitOpts(opts)
 	for _, o := range preOpts {

x/wasm/keeper/keeper_test.go

@@ -848,7 +848,7 @@ func TestInstantiateWithContractFactoryChildQueriesParent(t *testing.T) {
 	router := baseapp.NewMsgServiceRouter()
 	router.SetInterfaceRegistry(keepers.EncodingConfig.InterfaceRegistry)
 	types.RegisterMsgServer(router, NewMsgServerImpl(keeper))
-	keeper.messenger = NewDefaultMessageHandler(nil, router, nil, nil, nil, keepers.EncodingConfig.Codec, nil)
+	keeper.messenger = NewDefaultMessageHandler(nil, router, nil, nil, keepers.EncodingConfig.Codec, nil)
 	// overwrite wasmvm in response handler
 	keeper.wasmVMResponseHandler = NewDefaultWasmVMContractResponseHandler(NewMessageDispatcher(keeper.messenger, keeper))
 

x/wasm/keeper/options_test.go

@@ -155,7 +155,7 @@ func TestConstructorOptions(t *testing.T) {
 			opt := spec.srcOpt
 			_, gotPostOptMarker := opt.(postOptsFn)
 			require.Equal(t, spec.isPostOpt, gotPostOptMarker)
-			k := NewKeeper(codec, runtime.NewKVStoreService(storeKey), authkeeper.AccountKeeper{}, &bankkeeper.BaseKeeper{}, stakingkeeper.Keeper{}, nil, nil, nil, nil, nil, nil, nil, tempDir, types.DefaultNodeConfig(), types.VMConfig{}, AvailableCapabilities, "", nil, spec.srcOpt)
+			k := NewKeeper(codec, runtime.NewKVStoreService(storeKey), authkeeper.AccountKeeper{}, &bankkeeper.BaseKeeper{}, stakingkeeper.Keeper{}, nil, nil, nil, nil, nil, nil, tempDir, types.DefaultNodeConfig(), types.VMConfig{}, AvailableCapabilities, "", nil, spec.srcOpt)
 			spec.verify(t, k)
 		})
 	}

x/wasm/keeper/test_common.go

@@ -379,7 +379,6 @@ func createTestInput(
 		distributionkeeper.NewQuerier(distKeeper),
 		ibcKeeper.ChannelKeeper, // ICS4Wrapper
 		ibcKeeper.ChannelKeeper,
-		ibcKeeper.ChannelKeeperV2,
 		wasmtesting.MockIBCTransferKeeper{},
 		msgRouter,
 		querier,

x/wasm/types/expected_keepers.go

@@ -6,7 +6,6 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types"
 	connectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types"
 	channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types"
-	channeltypesv2 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/v2/types"
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -85,11 +84,6 @@ type ChannelKeeper interface {
 	GetAllChannelsWithPortPrefix(ctx sdk.Context, portPrefix string) []channeltypes.IdentifiedChannel
 }
 
-// ChannelKeeperV2 defines the expected IBC2 channel keeper
-type ChannelKeeperV2 interface {
-	SendPacket(goCtx context.Context, msg *channeltypesv2.MsgSendPacket) (*channeltypesv2.MsgSendPacketResponse, error)
-}
-
 // ICS4Wrapper defines the method for an IBC data package to be submitted.
 // The interface is implemented by the channel keeper on the lowest level in ibc-go. Middlewares or other abstractions
 // can add functionality on top of it. See ics4Wrapper in ibc-go.