fix

Author: pinosu

x/wasm/keeper/handler_plugin.go

@@ -122,20 +122,6 @@ func (h SDKMessageHandler) handleSdkMessage(ctx sdk.Context, contractAddr sdk.Ad
 	return nil, errorsmod.Wrapf(sdkerrors.ErrUnknownRequest, "can't route message %+v", msg)
 }
 
-type callDepthMessageHandler struct {
-	Messenger
-	MaxCallDepth uint32
-}
-
-func (h callDepthMessageHandler) DispatchMsg(ctx sdk.Context, contractAddr sdk.AccAddress, contractIBCPortID string, msg wasmvmtypes.CosmosMsg) (events []sdk.Event, data [][]byte, msgResponses [][]*codectypes.Any, err error) {
-	ctx, err = checkAndIncreaseCallDepth(ctx, h.MaxCallDepth)
-	if err != nil {
-		return nil, nil, nil, errorsmod.Wrap(err, "dispatch")
-	}
-
-	return h.Messenger.DispatchMsg(ctx, contractAddr, contractIBCPortID, msg)
-}
-
 // MessageHandlerChain defines a chain of handlers that are called one by one until it can be handled.
 type MessageHandlerChain struct {
 	handlers []Messenger

x/wasm/keeper/keeper.go

@@ -1287,6 +1287,11 @@ func (k *Keeper) handleContractResponse(
 		}
 		ctx.EventManager().EmitEvents(customEvents)
 	}
+	// keep track of call depth
+	ctx, err := checkAndIncreaseCallDepth(ctx, k.maxCallDepth)
+	if err != nil {
+		return nil, err
+	}
 	return k.wasmVMResponseHandler.Handle(ctx, contractAddr, ibcPort, msgs, data)
 }
 

x/wasm/keeper/keeper_cgo.go

@@ -63,8 +63,6 @@ func NewKeeper(
 	for _, o := range preOpts {
 		o.apply(keeper)
 	}
-	// always wrap the messenger, even if it was replaced by an option
-	keeper.messenger = callDepthMessageHandler{keeper.messenger, keeper.maxCallDepth}
 	// only set the wasmvm if no one set this in the options
 	// NewVM does a lot, so better not to create it and silently drop it.
 	if keeper.wasmVM == nil {

x/wasm/keeper/options_test.go

@@ -59,9 +59,7 @@ func TestConstructorOptions(t *testing.T) {
 		"message handler": {
 			srcOpt: WithMessageHandler(&wasmtesting.MockMessageHandler{}),
 			verify: func(t *testing.T, k Keeper) {
-				require.IsType(t, callDepthMessageHandler{}, k.messenger)
-				messenger, _ := k.messenger.(callDepthMessageHandler)
-				assert.IsType(t, &wasmtesting.MockMessageHandler{}, messenger.Messenger)
+				assert.IsType(t, &wasmtesting.MockMessageHandler{}, k.messenger)
 			},
 		},
 		"query plugins": {
@@ -72,7 +70,7 @@ func TestConstructorOptions(t *testing.T) {
 		},
 		"message handler decorator": {
 			srcOpt: WithMessageHandlerDecorator(func(old Messenger) Messenger {
-				require.IsType(t, callDepthMessageHandler{}, old)
+				require.IsType(t, &MessageHandlerChain{}, old)
 				return &wasmtesting.MockMessageHandler{}
 			}),
 			verify: func(t *testing.T, k Keeper) {