diff --git a/.changeset/entries/3df5614ff9581d5b7cbc540d8b53ff24cbdcc62d6891348fe0d7334cb8a17940.yaml b/.changeset/entries/3df5614ff9581d5b7cbc540d8b53ff24cbdcc62d6891348fe0d7334cb8a17940.yaml new file mode 100644 index 0000000000..a5819f6fe6 --- /dev/null +++ b/.changeset/entries/3df5614ff9581d5b7cbc540d8b53ff24cbdcc62d6891348fe0d7334cb8a17940.yaml @@ -0,0 +1,6 @@ +type: deps +module: other +pull_request: 1209 +description: Bump wasmd to 0.41.0 from 0.40.0 +backward_compatible: false +date: 2023-08-15T14:20:52.992816381Z diff --git a/app/app.go b/app/app.go index 37b6ff1072..b4a117102f 100644 --- a/app/app.go +++ b/app/app.go @@ -146,7 +146,7 @@ type DesmosApp struct { FeeGrantKeeper feegrantkeeper.Keeper ConsensusParamsKeeper consensusparamkeeper.Keeper - WasmKeeper wasm.Keeper + WasmKeeper wasmkeeper.Keeper // IBC modules TransferKeeper ibctransferkeeper.Keeper @@ -179,8 +179,7 @@ type DesmosApp struct { func NewDesmosApp( logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, - appOpts servertypes.AppOptions, wasmEnabledProposals []wasm.ProposalType, - baseAppOptions ...func(*baseapp.BaseApp), + appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp), ) *DesmosApp { var ( app = &DesmosApp{} @@ -306,7 +305,7 @@ func NewDesmosApp( scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) scopedIBCTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) scopedProfilesKeeper := app.CapabilityKeeper.ScopeToModule(profilestypes.ModuleName) - scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasm.ModuleName) + scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName) scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) @@ -401,10 +400,10 @@ func NewDesmosApp( // The last arguments can contain custom message handlers, and custom query handlers, // if we want to allow any custom callbacks // See https://github.com/CosmWasm/cosmwasm/blob/main/docs/CAPABILITIES-BUILT-IN.md - availableCapabilities := "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2" - app.WasmKeeper = wasm.NewKeeper( + availableCapabilities := "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3" + app.WasmKeeper = wasmkeeper.NewKeeper( app.appCodec, - app.GetKey(wasm.StoreKey), + app.GetKey(wasmtypes.StoreKey), app.AccountKeeper, app.BankKeeper, app.StakingKeeper, @@ -423,11 +422,6 @@ func NewDesmosApp( wasmOpts..., ) - // The gov proposal types can be individually enabled - if len(wasmEnabledProposals) != 0 { - govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(app.WasmKeeper, wasmEnabledProposals)) - } - // Set legacy router for backwards compatibility with gov v1beta1 app.GovKeeper.SetLegacyRouter(govRouter) @@ -451,7 +445,7 @@ func NewDesmosApp( ibcRouter := porttypes.NewRouter(). AddRoute(ibctransfertypes.ModuleName, transferIBCModule). AddRoute(profilestypes.ModuleName, profilesIBCModule). - AddRoute(wasm.ModuleName, wasmIBCModule). + AddRoute(wasmtypes.ModuleName, wasmIBCModule). AddRoute(icacontrollertypes.SubModuleName, icaControllerIBCModule). AddRoute(icahosttypes.SubModuleName, icaHostIBCModule) @@ -511,7 +505,7 @@ func NewDesmosApp( SigGasConsumer: ante.DefaultSigVerificationGasConsumer, }, IBCkeeper: app.IBCKeeper, - TxCounterStoreKey: app.GetKey(wasm.StoreKey), + TxCounterStoreKey: app.GetKey(wasmtypes.StoreKey), WasmConfig: &wasmConfig, SubspacesKeeper: *app.SubspacesKeeper, }, diff --git a/app/app_config.go b/app/app_config.go index 032caa0fec..d1b3d07bd0 100644 --- a/app/app_config.go +++ b/app/app_config.go @@ -100,6 +100,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" ) const ( @@ -122,8 +123,8 @@ func GetWasmOpts( postsKeeper postskeeper.Keeper, reportsKeeper reportskeeper.Keeper, reactionsKeeper reactionskeeper.Keeper, -) []wasm.Option { - var wasmOpts []wasm.Option +) []wasmkeeper.Option { + var wasmOpts []wasmkeeper.Option if cast.ToBool(appOpts.Get("telemetry.enabled")) { wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) } @@ -209,7 +210,7 @@ var ( {Account: stakingtypes.NotBondedPoolName, Permissions: []string{authtypes.Burner, authtypes.Staking}}, {Account: govtypes.ModuleName, Permissions: []string{authtypes.Burner}}, {Account: ibctransfertypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}}, - {Account: wasm.ModuleName, Permissions: []string{authtypes.Burner}}, + {Account: wasmtypes.ModuleName, Permissions: []string{authtypes.Burner}}, {Account: ibcfeetypes.ModuleName}, {Account: icatypes.ModuleName}, {Account: tokenfactorytypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}}, @@ -255,7 +256,7 @@ var ( supplytypes.ModuleName, tokenfactorytypes.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, } endBlockerOrder = []string{ @@ -293,7 +294,7 @@ var ( supplytypes.ModuleName, tokenfactorytypes.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, } // NOTE: The genutils module must occur after staking so that pools are @@ -339,7 +340,7 @@ var ( tokenfactorytypes.ModuleName, // wasm module should be at the end of app modules - wasm.ModuleName, + wasmtypes.ModuleName, crisistypes.ModuleName, } @@ -380,7 +381,7 @@ var ( supplytypes.ModuleName, tokenfactorytypes.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, crisistypes.ModuleName, } ) diff --git a/app/app_test.go b/app/app_test.go index 96c70a2b04..bd703555a2 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -19,15 +19,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - - "github.com/CosmWasm/wasmd/x/wasm" ) func TestSimAppExportAndBlockedAddrs(t *testing.T) { db := dbm.NewMemDB() app := NewDesmosApp( log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, - simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), wasm.EnableAllProposals, + simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), ) privVal := mock.NewPV() @@ -79,7 +77,7 @@ func TestSimAppExportAndBlockedAddrs(t *testing.T) { // Making a new app object with the db, so that initchain hasn't been called app2 := NewDesmosApp( - log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), wasm.EnableAllProposals, + log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), ) _, err = app2.ExportAppStateAndValidators(false, []string{}, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") diff --git a/app/desmos/cmd/root.go b/app/desmos/cmd/root.go index 148937e4d5..8890855358 100644 --- a/app/desmos/cmd/root.go +++ b/app/desmos/cmd/root.go @@ -6,7 +6,6 @@ import ( "os" simappparams "cosmossdk.io/simapp/params" - "github.com/CosmWasm/wasmd/x/wasm" serverconfig "github.com/cosmos/cosmos-sdk/server/config" "github.com/cosmos/cosmos-sdk/client/config" @@ -257,7 +256,6 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty return app.NewDesmosApp( logger, db, traceStore, true, appOpts, - wasm.DisableAllProposals, server.DefaultBaseappOptions(appOpts)..., ) } @@ -292,7 +290,6 @@ func createDesmosappAndExport( desmosApp = app.NewDesmosApp( logger, db, traceStore, height == -1, appOpts, - wasm.DisableAllProposals, ) if height != -1 { diff --git a/app/sim_test.go b/app/sim_test.go index dfb5a87763..c2e1ba86e0 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -35,7 +35,6 @@ import ( profilestypes "github.com/desmos-labs/desmos/v5/x/profiles/types" - "github.com/CosmWasm/wasmd/x/wasm" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -105,7 +104,7 @@ func TestFullAppSimulation(t *testing.T) { appOptions[server.FlagInvCheckPeriod] = simcli.FlagPeriodValue app := NewDesmosApp( - logger, db, nil, true, appOptions, wasm.EnableAllProposals, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), + logger, db, nil, true, appOptions, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), ) require.Equal(t, appName, app.Name()) @@ -152,7 +151,7 @@ func TestAppImportExport(t *testing.T) { appOptions[server.FlagInvCheckPeriod] = simcli.FlagPeriodValue app := NewDesmosApp( - logger, db, nil, true, appOptions, wasm.EnableAllProposals, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), + logger, db, nil, true, appOptions, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), ) require.Equal(t, appName, app.Name()) @@ -205,7 +204,7 @@ func TestAppImportExport(t *testing.T) { }() newApp := NewDesmosApp( - log.NewNopLogger(), newDB, nil, true, appOptions, wasm.EnableAllProposals, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), + log.NewNopLogger(), newDB, nil, true, appOptions, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), ) require.Equal(t, appName, newApp.Name()) @@ -296,7 +295,7 @@ func TestAppSimulationAfterImport(t *testing.T) { appOptions[server.FlagInvCheckPeriod] = simcli.FlagPeriodValue app := NewDesmosApp( - logger, db, nil, true, appOptions, wasm.EnableAllProposals, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), + logger, db, nil, true, appOptions, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), ) require.Equal(t, appName, app.Name()) @@ -343,7 +342,7 @@ func TestAppSimulationAfterImport(t *testing.T) { }() newApp := NewDesmosApp( - log.NewNopLogger(), newDB, nil, true, appOptions, wasm.EnableAllProposals, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), + log.NewNopLogger(), newDB, nil, true, appOptions, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID), ) require.Equal(t, appName, newApp.Name()) @@ -402,7 +401,7 @@ func TestAppStateDeterminism(t *testing.T) { db := dbm.NewMemDB() app := NewDesmosApp( - logger, db, nil, true, appOptions, wasm.EnableAllProposals, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID), + logger, db, nil, true, appOptions, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID), ) fmt.Printf( diff --git a/app/wasm_config.go b/app/wasm_config.go index 57f037ffaa..1a9f25bdf5 100644 --- a/app/wasm_config.go +++ b/app/wasm_config.go @@ -3,7 +3,6 @@ package app import ( "fmt" - "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -34,7 +33,7 @@ import ( subspacestypes "github.com/desmos-labs/desmos/v5/x/subspaces/types" subspaceswasm "github.com/desmos-labs/desmos/v5/x/subspaces/wasm" - wasmtypes "github.com/desmos-labs/desmos/v5/x/wasm/types" + desmoswasmtypes "github.com/desmos-labs/desmos/v5/x/wasm/types" ) const ( @@ -67,7 +66,7 @@ func NewDesmosCustomQueryPlugin( postsKeeper postskeeper.Keeper, reportsKeeper reportskeeper.Keeper, reactionsKeeper reactionskeeper.Keeper, -) wasm.QueryPlugins { +) wasmkeeper.QueryPlugins { queriers := map[string]wasmdesmos.Querier{ wasmdesmos.QueryRouteProfiles: profileswasm.NewProfilesWasmQuerier(profilesKeeper, cdc), wasmdesmos.QueryRouteSubspaces: subspaceswasm.NewSubspacesWasmQuerier(subspacesKeeper, cdc), @@ -85,8 +84,8 @@ func NewDesmosCustomQueryPlugin( panic(fmt.Errorf("codec must be *codec.ProtoCodec type: actual: %T", cdc)) } - stargateCdc := codec.NewProtoCodec(wasmtypes.NewWasmInterfaceRegistry(protoCdc.InterfaceRegistry())) - return wasm.QueryPlugins{ + stargateCdc := codec.NewProtoCodec(desmoswasmtypes.NewWasmInterfaceRegistry(protoCdc.InterfaceRegistry())) + return wasmkeeper.QueryPlugins{ Stargate: wasmkeeper.AcceptListStargateQuerier(GetStargateAcceptedQueries(), grpcQueryRouter, stargateCdc), Custom: querier.QueryCustom, } @@ -146,7 +145,7 @@ func GetStargateAcceptedQueries() wasmkeeper.AcceptedStargateQueries { } // NewDesmosCustomMessageEncoder initialize the custom message encoder to desmos app for contracts -func NewDesmosCustomMessageEncoder(cdc codec.Codec) wasm.MessageEncoders { +func NewDesmosCustomMessageEncoder(cdc codec.Codec) wasmkeeper.MessageEncoders { // Initialization of custom Desmos messages for contracts parserRouter := wasmdesmos.NewParserRouter() parsers := map[string]wasmdesmos.MsgParserInterface{ @@ -160,7 +159,7 @@ func NewDesmosCustomMessageEncoder(cdc codec.Codec) wasm.MessageEncoders { } parserRouter.Parsers = parsers - return wasm.MessageEncoders{ + return wasmkeeper.MessageEncoders{ Custom: parserRouter.ParseCustom, } } diff --git a/cosmwasm/msg_parser.go b/cosmwasm/msg_parser.go index af1e31e626..7ea19fac7b 100644 --- a/cosmwasm/msg_parser.go +++ b/cosmwasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -81,5 +81,5 @@ func (router ParserRouter) ParseCustom(contractAddr sdk.AccAddress, data json.Ra if parser, ok := router.Parsers[route]; ok { return parser.ParseCustomMsgs(contractAddr, msg) } - return nil, errors.Wrap(wasm.ErrInvalidMsg, "unimplemented route") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "unimplemented route") } diff --git a/cosmwasm/query_parser.go b/cosmwasm/query_parser.go index 2be363e0c8..e44e703b3f 100644 --- a/cosmwasm/query_parser.go +++ b/cosmwasm/query_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -81,5 +81,5 @@ func (q QuerierRouter) QueryCustom(ctx sdk.Context, data json.RawMessage) ([]byt if querier, ok := q.Queriers[route]; ok { return querier.QueryCustom(ctx, query) } - return nil, errors.Wrap(wasm.ErrQueryFailed, "unimplemented route") + return nil, errors.Wrap(wasmtypes.ErrQueryFailed, "unimplemented route") } diff --git a/go.mod b/go.mod index acf0128af5..f1f6556962 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff - github.com/CosmWasm/wasmd v0.40.0 + github.com/CosmWasm/wasmd v0.41.0 github.com/CosmWasm/wasmvm v1.3.0 github.com/armon/go-metrics v0.4.1 github.com/btcsuite/btcd/btcec/v2 v2.3.2 diff --git a/go.sum b/go.sum index 726dcb93d9..40760ab289 100644 --- a/go.sum +++ b/go.sum @@ -236,8 +236,8 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmd v0.40.0 h1:3Vvq1m8dPQdvZR+QJc86VIx6QoWAEVnuHxqBPshJvyo= -github.com/CosmWasm/wasmd v0.40.0/go.mod h1:SuxskRBB7+bpwXGhUXaEfdpjg5WKpdxBy7Tm36VRMUU= +github.com/CosmWasm/wasmd v0.41.0 h1:fmwxSbwb50zZDcBaayYFRLIaSFca+EFld1WOaQi49jg= +github.com/CosmWasm/wasmd v0.41.0/go.mod h1:0Sds1q2IsPaTN1gHa3BNOYcUFgtGvxH7CXEXPgoihns= github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= diff --git a/testutil/ibctesting/helper.go b/testutil/ibctesting/helper.go index 6839107d43..1681615919 100644 --- a/testutil/ibctesting/helper.go +++ b/testutil/ibctesting/helper.go @@ -5,7 +5,6 @@ import ( "testing" "time" - "github.com/CosmWasm/wasmd/x/wasm" dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" @@ -34,7 +33,7 @@ func setup(chainID string, withGenesis bool, invCheckPeriod uint) (*simapp.Desmo appOptions[flags.FlagHome] = simapp.DefaultNodeHome // ensure unique folder appOptions[server.FlagInvCheckPeriod] = invCheckPeriod - app := simapp.NewDesmosApp(log.NewNopLogger(), db, nil, true, appOptions, wasm.DisableAllProposals, baseapp.SetChainID(chainID)) + app := simapp.NewDesmosApp(log.NewNopLogger(), db, nil, true, appOptions, baseapp.SetChainID(chainID)) if withGenesis { return app, simapp.NewDefaultGenesisState(app.AppCodec()) } diff --git a/testutil/network.go b/testutil/network.go index 16b30d3d2d..7c0b682333 100644 --- a/testutil/network.go +++ b/testutil/network.go @@ -4,7 +4,6 @@ import ( "fmt" "time" - "github.com/CosmWasm/wasmd/x/wasm" dbm "github.com/cometbft/cometbft-db" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" @@ -27,7 +26,6 @@ func NewAppConstructor() network.AppConstructor { return app.NewDesmosApp( val.GetCtx().Logger, dbm.NewMemDB(), nil, true, simtestutil.NewAppOptionsWithFlagHome(val.GetCtx().Config.RootDir), - wasm.DisableAllProposals, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), baseapp.SetChainID(val.GetCtx().Viper.GetString(flags.FlagChainID)), diff --git a/x/posts/wasm/msg_parser.go b/x/posts/wasm/msg_parser.go index 25e54b7e54..5fd056df6f 100644 --- a/x/posts/wasm/msg_parser.go +++ b/x/posts/wasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -46,6 +46,6 @@ func (parser MsgsParser) ParseCustomMsgs(contractAddr sdk.AccAddress, data json. case msg.AnswerPoll != nil: return commons.HandleWasmMsg(parser.cdc, *msg.AnswerPoll, &types.MsgAnswerPoll{}) default: - return nil, errors.Wrap(wasm.ErrInvalidMsg, "cosmwasm-posts-msg-parser: message not supported") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "cosmwasm-posts-msg-parser: message not supported") } } diff --git a/x/profiles/wasm/msg_parser.go b/x/profiles/wasm/msg_parser.go index 80d3e00b11..57b900d314 100644 --- a/x/profiles/wasm/msg_parser.go +++ b/x/profiles/wasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -55,6 +55,6 @@ func (parser MsgsParser) ParseCustomMsgs(contractAddr sdk.AccAddress, data json. case msg.UnlinkApplication != nil: return commons.HandleWasmMsg(parser.cdc, *msg.UnlinkApplication, &types.MsgUnlinkApplication{}) default: - return nil, errors.Wrap(wasm.ErrInvalidMsg, "cosmwasm-profiles-msg-parser: message not supported") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "cosmwasm-profiles-msg-parser: message not supported") } } diff --git a/x/reactions/wasm/msg_parser.go b/x/reactions/wasm/msg_parser.go index 6b4351c36e..656f99f8e9 100644 --- a/x/reactions/wasm/msg_parser.go +++ b/x/reactions/wasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -43,6 +43,6 @@ func (parser MsgsParser) ParseCustomMsgs(contractAddr sdk.AccAddress, data json. case msg.SetReactionsParams != nil: return commons.HandleWasmMsg(parser.cdc, *msg.SetReactionsParams, &types.MsgSetReactionsParams{}) default: - return nil, errors.Wrap(wasm.ErrInvalidMsg, "cosmwasm-reactions-msg-parser: message not supported") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "cosmwasm-reactions-msg-parser: message not supported") } } diff --git a/x/relationships/wasm/msg_parser.go b/x/relationships/wasm/msg_parser.go index 5d81131838..eec1928d65 100644 --- a/x/relationships/wasm/msg_parser.go +++ b/x/relationships/wasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -43,6 +43,6 @@ func (parser MsgsParser) ParseCustomMsgs(contractAddr sdk.AccAddress, data json. return commons.HandleWasmMsg(parser.cdc, *msg.UnblockUser, &types.MsgUnblockUser{}) default: - return nil, errors.Wrap(wasm.ErrInvalidMsg, "cosmwasm-relationships-msg-parser: message not supported") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "cosmwasm-relationships-msg-parser: message not supported") } } diff --git a/x/reports/wasm/msg_parser.go b/x/reports/wasm/msg_parser.go index 11588726cb..f9e878bb06 100644 --- a/x/reports/wasm/msg_parser.go +++ b/x/reports/wasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -41,6 +41,6 @@ func (parser MsgsParser) ParseCustomMsgs(contractAddr sdk.AccAddress, data json. case msg.RemoveReason != nil: return commons.HandleWasmMsg(parser.cdc, *msg.RemoveReason, &types.MsgRemoveReason{}) default: - return nil, errors.Wrap(wasm.ErrInvalidMsg, "cosmwasm-reports-msg-parser: message not supported") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "cosmwasm-reports-msg-parser: message not supported") } } diff --git a/x/subspaces/wasm/msg_parser.go b/x/subspaces/wasm/msg_parser.go index 2f58e9c943..0b3f685bcb 100644 --- a/x/subspaces/wasm/msg_parser.go +++ b/x/subspaces/wasm/msg_parser.go @@ -4,7 +4,7 @@ import ( "encoding/json" "cosmossdk.io/errors" - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -59,6 +59,6 @@ func (parser MsgsParser) ParseCustomMsgs(contractAddr sdk.AccAddress, data json. case msg.RevokeAllowance != nil: return commons.HandleWasmMsg(parser.cdc, *msg.RevokeAllowance, &types.MsgRevokeAllowance{}) default: - return nil, errors.Wrap(wasm.ErrInvalidMsg, "cosmwasm-subspaces-msg-parser: message not supported") + return nil, errors.Wrap(wasmtypes.ErrInvalidMsg, "cosmwasm-subspaces-msg-parser: message not supported") } }