Merge branch 'main' into robert/auction-endblocker

app/app.go

@@ -669,9 +669,6 @@ func New(
 		panic(fmt.Sprintf("error while reading wasm config: %s", err))
 	}
 
-	// Register umee custom plugin to wasm
-	wasmOpts = append(uwasm.RegisterCustomPlugins(app.LeverageKeeper, app.OracleKeeper, app.IncentiveKeeper,
-		app.MetokenKeeperB), wasmOpts...)
 	// Register stargate queries
 	wasmOpts = append(wasmOpts, uwasm.RegisterStargateQueries(*bApp.GRPCQueryRouter(), appCodec)...)
 	availableCapabilities := strings.Join(AllCapabilities(), ",")

app/wasm/custom_plugins.go

@@ -5,34 +5,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	"github.com/umee-network/umee/v6/app/wasm/msg"
 	"github.com/umee-network/umee/v6/app/wasm/query"
-	inckeeper "github.com/umee-network/umee/v6/x/incentive/keeper"
-	leveragekeeper "github.com/umee-network/umee/v6/x/leverage/keeper"
-	metokenkeeper "github.com/umee-network/umee/v6/x/metoken/keeper"
-	oraclekeeper "github.com/umee-network/umee/v6/x/oracle/keeper"
 )
 
-// RegisterCustomPlugins expose the queries and msgs of native modules to wasm.
-func RegisterCustomPlugins(
-	leverageKeeper leveragekeeper.Keeper,
-	oracleKeeper oraclekeeper.Keeper,
-	incentiveKeeper inckeeper.Keeper,
-	metokenBuilder metokenkeeper.Builder,
-) []wasmkeeper.Option {
-	wasmQueryPlugin := query.NewQueryPlugin(leverageKeeper, oracleKeeper, incentiveKeeper, metokenBuilder)
-	queryPluginOpt := wasmkeeper.WithQueryPlugins(&wasmkeeper.QueryPlugins{
-		Custom: wasmQueryPlugin.CustomQuerier(),
-	})
-
-	messagePluginOpt := wasmkeeper.WithMessageHandlerDecorator(msg.NewMessagePlugin(leverageKeeper))
-
-	return []wasmkeeper.Option{
-		queryPluginOpt,
-		messagePluginOpt,
-	}
-}
-
 // RegisterStargateQueries expose the stargate queries
 func RegisterStargateQueries(queryRouter baseapp.GRPCQueryRouter, codec codec.Codec) []wasmkeeper.Option {
 	queryPluginOpt := wasmkeeper.WithQueryPlugins(&wasmkeeper.QueryPlugins{