diff --git a/app/ante_handler.go b/app/ante_handler.go index a852c1d30..07a356968 100644 --- a/app/ante_handler.go +++ b/app/ante_handler.go @@ -16,8 +16,8 @@ import ( ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" feemarketante "github.com/skip-mev/feemarket/x/feemarket/ante" - globalfeeante "github.com/neutron-org/neutron/v4/x/globalfee/ante" - globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper" + globalfeeante "github.com/neutron-org/neutron/v5/x/globalfee/ante" + globalfeekeeper "github.com/neutron-org/neutron/v5/x/globalfee/keeper" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/app.go b/app/app.go index e5f286eab..5f45e3f26 100644 --- a/app/app.go +++ b/app/app.go @@ -10,18 +10,20 @@ import ( "path/filepath" "time" - "github.com/neutron-org/neutron/v4/x/dynamicfees" - dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types" "github.com/skip-mev/feemarket/x/feemarket" feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit" + "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec" - appconfig "github.com/neutron-org/neutron/v4/app/config" + appconfig "github.com/neutron-org/neutron/v5/app/config" "github.com/skip-mev/slinky/abci/strategies/aggregator" "github.com/skip-mev/slinky/x/oracle" @@ -36,10 +38,9 @@ import ( oracleclient "github.com/skip-mev/slinky/service/clients/oracle" servicemetrics "github.com/skip-mev/slinky/service/metrics" - v401 "github.com/neutron-org/neutron/v4/app/upgrades/v4.0.1" - v500 "github.com/neutron-org/neutron/v4/app/upgrades/v5.0.0" - "github.com/neutron-org/neutron/v4/x/globalfee" - globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" + v500 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.0" + "github.com/neutron-org/neutron/v5/x/globalfee" + globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" "cosmossdk.io/log" db "github.com/cosmos/cosmos-db" @@ -57,11 +58,11 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" tendermint "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" - "github.com/neutron-org/neutron/v4/docs" + "github.com/neutron-org/neutron/v5/docs" - "github.com/neutron-org/neutron/v4/app/upgrades" + "github.com/neutron-org/neutron/v5/app/upgrades" - "github.com/neutron-org/neutron/v4/x/cron" + "github.com/neutron-org/neutron/v5/x/cron" "cosmossdk.io/x/evidence" evidencekeeper "cosmossdk.io/x/evidence/keeper" @@ -132,6 +133,8 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types" + ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" + ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" //nolint:staticcheck ibcporttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" @@ -141,12 +144,12 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" - crontypes "github.com/neutron-org/neutron/v4/x/cron/types" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" + crontypes "github.com/neutron-org/neutron/v5/x/cron/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory" - tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory" + tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" "github.com/cosmos/admin-module/v2/x/adminmodule" adminmodulecli "github.com/cosmos/admin-module/v2/x/adminmodule/client/cli" @@ -155,29 +158,29 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - appparams "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/wasmbinding" - "github.com/neutron-org/neutron/v4/x/contractmanager" - contractmanagermodulekeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - contractmanagermoduletypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" - dynamicfeeskeeper "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner" - feeburnerkeeper "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - feeburnertypes "github.com/neutron-org/neutron/v4/x/feeburner/types" - "github.com/neutron-org/neutron/v4/x/feerefunder" - feekeeper "github.com/neutron-org/neutron/v4/x/feerefunder/keeper" - ibchooks "github.com/neutron-org/neutron/v4/x/ibc-hooks" - ibchookstypes "github.com/neutron-org/neutron/v4/x/ibc-hooks/types" - "github.com/neutron-org/neutron/v4/x/interchainqueries" - interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - interchainqueriesmoduletypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs" - interchaintxskeeper "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" - interchaintxstypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" - transferSudo "github.com/neutron-org/neutron/v4/x/transfer" - wrapkeeper "github.com/neutron-org/neutron/v4/x/transfer/keeper" - - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" + appparams "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/wasmbinding" + "github.com/neutron-org/neutron/v5/x/contractmanager" + contractmanagermodulekeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + contractmanagermoduletypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" + dynamicfeeskeeper "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner" + feeburnerkeeper "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + feeburnertypes "github.com/neutron-org/neutron/v5/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feerefunder" + feekeeper "github.com/neutron-org/neutron/v5/x/feerefunder/keeper" + ibchooks "github.com/neutron-org/neutron/v5/x/ibc-hooks" + ibchookstypes "github.com/neutron-org/neutron/v5/x/ibc-hooks/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries" + interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + interchainqueriesmoduletypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs" + interchaintxskeeper "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" + interchaintxstypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" + transferSudo "github.com/neutron-org/neutron/v5/x/transfer" + wrapkeeper "github.com/neutron-org/neutron/v5/x/transfer/keeper" + + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" ccvconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer" ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" @@ -190,12 +193,12 @@ import ( pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper" pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types" - "github.com/neutron-org/neutron/v4/x/dex" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" - globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper" - gmpmiddleware "github.com/neutron-org/neutron/v4/x/gmp" + globalfeekeeper "github.com/neutron-org/neutron/v5/x/globalfee/keeper" + gmpmiddleware "github.com/neutron-org/neutron/v5/x/gmp" // Block-sdk imports blocksdkabci "github.com/skip-mev/block-sdk/v2/abci" @@ -222,7 +225,7 @@ const ( ) var ( - Upgrades = []upgrades.Upgrade{v401.Upgrade, v500.Upgrade} + Upgrades = []upgrades.Upgrade{v500.Upgrade} // DefaultNodeHome default home directories for the application daemon DefaultNodeHome string @@ -269,6 +272,7 @@ var ( ), ibchooks.AppModuleBasic{}, packetforward.AppModuleBasic{}, + ibcratelimit.AppModuleBasic{}, auction.AppModuleBasic{}, globalfee.AppModule{}, feemarket.AppModuleBasic{}, @@ -285,7 +289,7 @@ var ( auctiontypes.ModuleName: nil, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, icatypes.ModuleName: nil, - wasmtypes.ModuleName: {authtypes.Burner}, + wasmtypes.ModuleName: {}, interchainqueriesmoduletypes.ModuleName: nil, feetypes.ModuleName: nil, feeburnertypes.ModuleName: nil, @@ -369,8 +373,10 @@ type App struct { PFMModule packetforward.AppModule - HooksTransferIBCModule *ibchooks.IBCMiddleware - HooksICS4Wrapper ibchooks.ICS4Middleware + TransferStack *ibchooks.IBCMiddleware + Ics20WasmHooks *ibchooks.WasmHooks + RateLimitingICS4Wrapper *ibcratelimit.ICS4Wrapper + HooksICS4Wrapper ibchooks.ICS4Middleware // make scoped keepers public for test purposes ScopedIBCKeeper capabilitykeeper.ScopedKeeper @@ -385,7 +391,8 @@ type App struct { ConsensusParamsKeeper consensusparamkeeper.Keeper - WasmKeeper wasmkeeper.Keeper + WasmKeeper wasmkeeper.Keeper + ContractKeeper *wasmkeeper.PermissionedKeeper // slinky MarketMapKeeper *marketmapkeeper.Keeper @@ -406,7 +413,7 @@ type App struct { checkTxHandler checktx.CheckTx } -// AutoCLIOpts returns options based upon the modules in the neutron v4 app. +// AutoCLIOpts returns options based upon the modules in the neutron v5 app. func (app *App) AutoCLIOpts(initClientCtx client.Context) autocli.AppOptions { modules := make(map[string]appmodule.AppModule) for _, m := range app.mm.Modules { @@ -476,7 +483,7 @@ func New( icahosttypes.StoreKey, capabilitytypes.StoreKey, interchainqueriesmoduletypes.StoreKey, contractmanagermoduletypes.StoreKey, interchaintxstypes.StoreKey, wasmtypes.StoreKey, feetypes.StoreKey, feeburnertypes.StoreKey, adminmoduletypes.StoreKey, ccvconsumertypes.StoreKey, tokenfactorytypes.StoreKey, pfmtypes.StoreKey, - crontypes.StoreKey, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, dextypes.StoreKey, auctiontypes.StoreKey, + crontypes.StoreKey, ibcratelimittypes.ModuleName, ibchookstypes.StoreKey, consensusparamtypes.StoreKey, crisistypes.StoreKey, dextypes.StoreKey, auctiontypes.StoreKey, oracletypes.StoreKey, marketmaptypes.StoreKey, feemarkettypes.StoreKey, dynamicfeestypes.StoreKey, globalfeetypes.StoreKey, ) tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey, dextypes.TStoreKey) @@ -508,6 +515,7 @@ func New( scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) + app.ScopedTransferKeeper = scopedTransferKeeper scopedWasmKeeper := app.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName) scopedInterTxKeeper := app.CapabilityKeeper.ScopeToModule(interchaintxstypes.ModuleName) scopedCCVConsumerKeeper := app.CapabilityKeeper.ScopeToModule(ccvconsumertypes.ModuleName) @@ -589,31 +597,7 @@ func New( appCodec, keys[ibchost.StoreKey], app.GetSubspace(ibchost.ModuleName), &app.ConsumerKeeper, app.UpgradeKeeper, scopedIBCKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) - app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( - appCodec, keys[icacontrollertypes.StoreKey], app.GetSubspace(icacontrollertypes.SubModuleName), - app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 feerefunder - app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, - scopedICAControllerKeeper, app.MsgServiceRouter(), - authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - ) - - app.ICAHostKeeper = icahostkeeper.NewKeeper( - appCodec, keys[icahosttypes.StoreKey], app.GetSubspace(icahosttypes.SubModuleName), - app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 feerefunder - app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, - app.AccountKeeper, scopedICAHostKeeper, app.MsgServiceRouter(), - authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - ) - app.ICAHostKeeper.WithQueryRouter(app.GRPCQueryRouter()) - - app.ContractManagerKeeper = *contractmanagermodulekeeper.NewKeeper( - appCodec, - keys[contractmanagermoduletypes.StoreKey], - keys[contractmanagermoduletypes.MemStoreKey], - &app.WasmKeeper, - authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - ) - + // Feekeeper needs to be initialized before middlewares injection app.FeeKeeper = feekeeper.NewKeeper( appCodec, keys[feetypes.StoreKey], @@ -624,55 +608,45 @@ func New( ) feeModule := feerefunder.NewAppModule(appCodec, *app.FeeKeeper, app.AccountKeeper, app.BankKeeper) - app.FeeBurnerKeeper = feeburnerkeeper.NewKeeper( + app.ContractManagerKeeper = *contractmanagermodulekeeper.NewKeeper( appCodec, - keys[feeburnertypes.StoreKey], - keys[feeburnertypes.MemStoreKey], - app.AccountKeeper, - &app.BankKeeper, + keys[contractmanagermoduletypes.StoreKey], + keys[contractmanagermoduletypes.MemStoreKey], + &app.WasmKeeper, authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) - feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) - app.GlobalFeeKeeper = globalfeekeeper.NewKeeper(appCodec, keys[globalfeetypes.StoreKey], authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) + app.WireICS20PreWasmKeeper(appCodec) + app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) - // PFMKeeper must be created before TransferKeeper - app.PFMKeeper = pfmkeeper.NewKeeper( - appCodec, - app.keys[pfmtypes.StoreKey], - app.TransferKeeper.Keeper, - app.IBCKeeper.ChannelKeeper, - app.FeeBurnerKeeper, - &app.BankKeeper, + app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( + appCodec, keys[icacontrollertypes.StoreKey], app.GetSubspace(icacontrollertypes.SubModuleName), app.IBCKeeper.ChannelKeeper, + app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, + scopedICAControllerKeeper, app.MsgServiceRouter(), authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) - wasmHooks := ibchooks.NewWasmHooks(nil, sdk.GetConfig().GetBech32AccountAddrPrefix()) // The contract keeper needs to be set later - app.HooksICS4Wrapper = ibchooks.NewICS4Middleware( + + app.ICAHostKeeper = icahostkeeper.NewKeeper( + appCodec, keys[icahosttypes.StoreKey], app.GetSubspace(icahosttypes.SubModuleName), app.IBCKeeper.ChannelKeeper, - app.PFMKeeper, - &wasmHooks, + app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, + app.AccountKeeper, scopedICAHostKeeper, app.MsgServiceRouter(), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) + app.ICAHostKeeper.WithQueryRouter(app.GRPCQueryRouter()) - // Create Transfer Keepers - app.TransferKeeper = wrapkeeper.NewKeeper( + app.FeeBurnerKeeper = feeburnerkeeper.NewKeeper( appCodec, - keys[ibctransfertypes.StoreKey], - app.GetSubspace(ibctransfertypes.ModuleName), - app.HooksICS4Wrapper, // essentially still app.IBCKeeper.ChannelKeeper under the hood because no hook overrides - app.IBCKeeper.ChannelKeeper, - app.IBCKeeper.PortKeeper, + keys[feeburnertypes.StoreKey], + keys[feeburnertypes.MemStoreKey], app.AccountKeeper, &app.BankKeeper, - scopedTransferKeeper, - app.FeeKeeper, - contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), ) + feeBurnerModule := feeburner.NewAppModule(appCodec, *app.FeeBurnerKeeper) - app.PFMKeeper.SetTransferKeeper(app.TransferKeeper.Keeper) - - transferModule := transferSudo.NewAppModule(app.TransferKeeper) + app.GlobalFeeKeeper = globalfeekeeper.NewKeeper(appCodec, keys[globalfeetypes.StoreKey], authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) // Create evidence Keeper for to register the IBC light client misbehaviour evidence route evidenceKeeper := evidencekeeper.NewKeeper( @@ -847,7 +821,7 @@ func New( &app.BankKeeper, nil, nil, - app.IBCKeeper.ChannelKeeper, // may be replaced with middleware such as ics29 feerefunder + app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.PortKeeper, scopedWasmKeeper, @@ -860,19 +834,10 @@ func New( authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), wasmOpts..., ) - wasmHooks.ContractKeeper = &app.WasmKeeper app.CronKeeper.WasmMsgServer = wasmkeeper.NewMsgServerImpl(&app.WasmKeeper) cronModule := cron.NewAppModule(appCodec, app.CronKeeper) - transferIBCModule := transferSudo.NewIBCModule( - app.TransferKeeper, - contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), - ) - // receive call order: wasmHooks#OnRecvPacketOverride(transferIbcModule#OnRecvPacket()) - ibcHooksMiddleware := ibchooks.NewIBCMiddleware(&transferIBCModule, &app.HooksICS4Wrapper) - app.HooksTransferIBCModule = &ibcHooksMiddleware - // Create static IBC router, add transfer route, then set and seal it ibcRouter := ibcporttypes.NewRouter() @@ -894,23 +859,18 @@ func New( ) interchainTxsModule := interchaintxs.NewAppModule(appCodec, app.InterchainTxsKeeper, app.AccountKeeper, app.BankKeeper) contractManagerModule := contractmanager.NewAppModule(appCodec, app.ContractManagerKeeper) + ibcRateLimitmodule := ibcratelimit.NewAppModule(appCodec, app.RateLimitingICS4Wrapper.IbcratelimitKeeper, app.RateLimitingICS4Wrapper) ibcHooksModule := ibchooks.NewAppModule(app.AccountKeeper) - app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName)) + transferModule := transferSudo.NewAppModule(app.TransferKeeper) + app.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper) - var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware( - app.HooksTransferIBCModule, - app.PFMKeeper, - 0, - pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, - pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, - ) - - ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack) + app.RateLimitingICS4Wrapper.ContractKeeper = app.ContractKeeper + app.Ics20WasmHooks.ContractKeeper = &app.WasmKeeper ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack). AddRoute(icahosttypes.SubModuleName, icaHostIBCModule). - AddRoute(ibctransfertypes.ModuleName, ibcStack). + AddRoute(ibctransfertypes.ModuleName, app.TransferStack). AddRoute(interchaintxstypes.ModuleName, icaControllerStack). AddRoute(wasmtypes.ModuleName, wasm.NewIBCHandler(app.WasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper)). AddRoute(ccvconsumertypes.ModuleName, consumerModule) @@ -950,6 +910,7 @@ func New( feeBurnerModule, contractManagerModule, adminModule, + ibcRateLimitmodule, ibcHooksModule, tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, app.AccountKeeper, app.BankKeeper), cronModule, @@ -998,6 +959,7 @@ func New( feetypes.ModuleName, feeburnertypes.ModuleName, adminmoduletypes.ModuleName, + ibcratelimittypes.ModuleName, ibchookstypes.ModuleName, pfmtypes.ModuleName, crontypes.ModuleName, @@ -1034,6 +996,7 @@ func New( feetypes.ModuleName, feeburnertypes.ModuleName, adminmoduletypes.ModuleName, + ibcratelimittypes.ModuleName, ibchookstypes.ModuleName, pfmtypes.ModuleName, crontypes.ModuleName, @@ -1075,6 +1038,7 @@ func New( feetypes.ModuleName, feeburnertypes.ModuleName, adminmoduletypes.ModuleName, + ibcratelimittypes.ModuleName, ibchookstypes.ModuleName, // after auth keeper pfmtypes.ModuleName, crontypes.ModuleName, @@ -1109,6 +1073,7 @@ func New( ibc.NewAppModule(app.IBCKeeper), params.NewAppModule(app.ParamsKeeper), transferModule, + ibcRateLimitmodule, consumerModule, icaModule, app.PFMModule, @@ -1398,6 +1363,7 @@ func (app *App) setupUpgradeHandlers() { FeeMarketKeeper: app.FeeMarkerKeeper, DynamicfeesKeeper: app.DynamicFeesKeeper, DexKeeper: &app.DexKeeper, + IbcRateLimitKeeper: app.RateLimitingICS4Wrapper.IbcratelimitKeeper, GlobalFeeSubspace: app.GetSubspace(globalfee.ModuleName), CcvConsumerSubspace: app.GetSubspace(ccvconsumertypes.ModuleName), }, @@ -1675,3 +1641,90 @@ func overrideWasmVariables() { wasmtypes.MaxWasmSize = 1_677_722 // ~1.6 mb (1024 * 1024 * 1.6) wasmtypes.MaxProposalWasmSize = wasmtypes.MaxWasmSize } + +// WireICS20PreWasmKeeper Create the IBC Transfer Stack from bottom to top: +// * SendPacket. Originates from the transferKeeper and goes up the stack: +// transferKeeper.SendPacket -> ibc_rate_limit.SendPacket -> ibc_hooks.SendPacket -> channel.SendPacket +// * RecvPacket, message that originates from core IBC and goes down to app, the flow is the other way +// channel.RecvPacket -> ibc_hooks.OnRecvPacket -> ibc_rate_limit.OnRecvPacket -> gmp.OnRecvPacket -> pfm.OnRecvPacket -> transfer.OnRecvPacket +// +// Note that the forward middleware is only integrated on the "receive" direction. It can be safely skipped when sending. +// Note also that the forward middleware is called "router", but we are using the name "pfm" (packet forward middleware) for clarity +// This may later be renamed upstream: https://github.com/ibc-apps/middleware/packet-forward-middleware/issues/10 +// +// After this, the wasm keeper is required to be set on both +// app.Ics20WasmHooks AND app.RateLimitingICS4Wrapper +func (app *App) WireICS20PreWasmKeeper( + appCodec codec.Codec, +) { + // PFMKeeper must be created before TransferKeeper + app.PFMKeeper = pfmkeeper.NewKeeper( + appCodec, + app.keys[pfmtypes.StoreKey], + app.TransferKeeper.Keeper, // set later + app.IBCKeeper.ChannelKeeper, + app.FeeBurnerKeeper, + &app.BankKeeper, + app.IBCKeeper.ChannelKeeper, + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), + ) + + wasmHooks := ibchooks.NewWasmHooks(nil, sdk.GetConfig().GetBech32AccountAddrPrefix()) // The contract keeper needs to be set later + app.Ics20WasmHooks = &wasmHooks + app.HooksICS4Wrapper = ibchooks.NewICS4Middleware( + app.IBCKeeper.ChannelKeeper, + app.IBCKeeper.ChannelKeeper, + &wasmHooks, + ) + + ibcratelimitKeeper := ibcratelimitkeeper.NewKeeper(appCodec, app.keys[ibcratelimittypes.ModuleName], authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String()) + // ChannelKeeper wrapper for rate limiting SendPacket(). The wasmKeeper needs to be added after it's created + rateLimitingICS4Wrapper := ibcratelimit.NewICS4Middleware( + app.HooksICS4Wrapper, + &app.AccountKeeper, + // wasm keeper we set later, right after wasmkeeper init. line 868 + nil, + &app.BankKeeper, + &ibcratelimitKeeper, + ) + app.RateLimitingICS4Wrapper = &rateLimitingICS4Wrapper + + // Create Transfer Keepers + app.TransferKeeper = wrapkeeper.NewKeeper( + appCodec, + app.keys[ibctransfertypes.StoreKey], + app.GetSubspace(ibctransfertypes.ModuleName), + app.RateLimitingICS4Wrapper, + app.IBCKeeper.ChannelKeeper, + app.IBCKeeper.PortKeeper, + app.AccountKeeper, + &app.BankKeeper, + app.ScopedTransferKeeper, + app.FeeKeeper, + contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), + authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), + ) + + app.PFMKeeper.SetTransferKeeper(app.TransferKeeper.Keeper) + + // Packet Forward Middleware + // Initialize packet forward middleware router + var ibcStack ibcporttypes.IBCModule = packetforward.NewIBCMiddleware( + transferSudo.NewIBCModule( + app.TransferKeeper, + contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper), + ), + app.PFMKeeper, + 0, + pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp, + pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp, + ) + + ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack) + // RateLimiting IBC Middleware + rateLimitingTransferModule := ibcratelimit.NewIBCModule(ibcStack, app.RateLimitingICS4Wrapper) + + // Hooks Middleware + hooksTransferModule := ibchooks.NewIBCMiddleware(&rateLimitingTransferModule, &app.HooksICS4Wrapper) + app.TransferStack = &hooksTransferModule +} diff --git a/app/encoding.go b/app/encoding.go index 7ff2d3085..d102f4380 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -3,7 +3,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/proposals_allowlisting.go b/app/proposals_allowlisting.go index 9b360b0ea..e68cd1b46 100644 --- a/app/proposals_allowlisting.go +++ b/app/proposals_allowlisting.go @@ -16,20 +16,21 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck ccvconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" + ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" - dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types" - globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" + dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types" + globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" - crontypes "github.com/neutron-org/neutron/v4/x/cron/types" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" - feeburnertypes "github.com/neutron-org/neutron/v4/x/feeburner/types" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - interchainqueriestypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - interchaintxstypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" + crontypes "github.com/neutron-org/neutron/v5/x/cron/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" + feeburnertypes "github.com/neutron-org/neutron/v5/x/feeburner/types" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + interchainqueriestypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + interchaintxstypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func IsConsumerProposalAllowlisted(content govtypes.Content) bool { @@ -93,7 +94,8 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool { *feemarkettypes.MsgParams, *dynamicfeestypes.MsgUpdateParams, *ibctransfertypes.MsgUpdateParams, - *globalfeetypes.MsgUpdateParams: + *globalfeetypes.MsgUpdateParams, + *ibcratelimittypes.MsgUpdateParams: return true } return false diff --git a/app/proposals_allowlisting_test.go b/app/proposals_allowlisting_test.go index e7fc0ad5f..806d7badd 100644 --- a/app/proposals_allowlisting_test.go +++ b/app/proposals_allowlisting_test.go @@ -3,15 +3,15 @@ package app_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" cmttypes "github.com/cometbft/cometbft/types" ibctesting "github.com/cosmos/ibc-go/v8/testing" icssimapp "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil" ) func TestConsumerWhitelistingKeys(t *testing.T) { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index dfbce160c..6a313828f 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -13,18 +13,19 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper" feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" - dynamicfeeskeeper "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper" + dynamicfeeskeeper "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper" - contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - feeburnerkeeper "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - icqkeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" + contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" + feeburnerkeeper "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + icqkeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" transferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" @@ -66,6 +67,7 @@ type UpgradeKeepers struct { FeeMarketKeeper *feemarketkeeper.Keeper DynamicfeesKeeper *dynamicfeeskeeper.Keeper DexKeeper *dexkeeper.Keeper + IbcRateLimitKeeper *ibcratelimitkeeper.Keeper // subspaces GlobalFeeSubspace paramtypes.Subspace CcvConsumerSubspace paramtypes.Subspace diff --git a/app/upgrades/v4.0.1/constants.go b/app/upgrades/v4.0.1/constants.go deleted file mode 100644 index 6e78acb3b..000000000 --- a/app/upgrades/v4.0.1/constants.go +++ /dev/null @@ -1,38 +0,0 @@ -package v400 - -import ( - storetypes "cosmossdk.io/store/types" - feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" - marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" - oracletypes "github.com/skip-mev/slinky/x/oracle/types" - - dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types" - - "github.com/neutron-org/neutron/v4/app/upgrades" - globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" -) - -const ( - // UpgradeName defines the on-chain upgrade name. - UpgradeName = "v4.0.1" - - // MarketMapAuthorityMultisig defines the address of a market-map authority governed by a - // multi-sig of contributors. - MarketMapAuthorityMultisig = "neutron1ua63s43u2p4v38pxhcxmps0tj2gudyw2hfeetz" - - DecimalsAdjustment = 1_000_000_000_000 -) - -var Upgrade = upgrades.Upgrade{ - UpgradeName: UpgradeName, - CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: storetypes.StoreUpgrades{ - Added: []string{ - globalfeetypes.ModuleName, - marketmaptypes.ModuleName, - oracletypes.ModuleName, - feemarkettypes.ModuleName, - dynamicfeestypes.ModuleName, - }, - }, -} diff --git a/app/upgrades/v4.0.1/upgrades.go b/app/upgrades/v4.0.1/upgrades.go deleted file mode 100644 index a59168406..000000000 --- a/app/upgrades/v4.0.1/upgrades.go +++ /dev/null @@ -1,259 +0,0 @@ -package v400 - -import ( - "context" - "fmt" - "sort" - - "github.com/skip-mev/slinky/cmd/constants/marketmaps" - - appparams "github.com/neutron-org/neutron/v4/app/params" - - "cosmossdk.io/errors" - "cosmossdk.io/math" - - feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper" - feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" - - dynamicfeeskeeper "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper" - dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types" - - upgradetypes "cosmossdk.io/x/upgrade/types" - comettypes "github.com/cometbft/cometbft/proto/tendermint/types" - adminmoduletypes "github.com/cosmos/admin-module/v2/x/adminmodule/types" - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/module" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" - "github.com/cosmos/cosmos-sdk/x/consensus/types" - marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" - marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" - - "github.com/neutron-org/neutron/v4/app/upgrades" -) - -func CreateUpgradeHandler( - mm *module.Manager, - configurator module.Configurator, - keepers *upgrades.UpgradeKeepers, - _ upgrades.StoreKeys, - _ codec.Codec, -) upgradetypes.UpgradeHandler { - return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - ctx := sdk.UnwrapSDKContext(c) - - ctx.Logger().Info("Starting module migrations...") - vm, err := mm.RunMigrations(ctx, configurator, vm) - if err != nil { - return vm, err - } - - ctx.Logger().Info("Setting consensus params...") - err = enableVoteExtensions(ctx, keepers.ConsensusKeeper) - if err != nil { - return nil, err - } - - ctx.Logger().Info("Setting marketmap params...") - err = setMarketMapParams(ctx, keepers.MarketmapKeeper) - if err != nil { - return nil, err - } - - ctx.Logger().Info("Setting dynamicfees/feemarket params...") - err = setFeeMarketParams(ctx, keepers.FeeMarketKeeper) - if err != nil { - return nil, err - } - - err = setDynamicFeesParams(ctx, keepers.DynamicfeesKeeper) - if err != nil { - return nil, err - } - - ctx.Logger().Info("Setting marketmap and oracle state...") - err = setMarketState(ctx, keepers.MarketmapKeeper) - if err != nil { - return nil, err - } - - ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName)) - return vm, nil - } -} - -func setMarketMapParams(ctx sdk.Context, marketmapKeeper *marketmapkeeper.Keeper) error { - marketmapParams := marketmaptypes.Params{ - MarketAuthorities: []string{authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), MarketMapAuthorityMultisig}, - Admin: authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - } - return marketmapKeeper.SetParams(ctx, marketmapParams) -} - -// NtrnPrices describes prices of any token in NTRN for dynamic fee resolver -// there are several 18decimals coins, we need to adjust all the coins with the same base (6 decimals) prior to do any math -// by dividing by 10^12 -var NtrnPrices = sdk.NewDecCoins( - // Token,Denom,TWAP30D (USD),Price in NTRN (30d TWAP of DENOM / 30d TWAP of NTRN),Price + 30% premium - // wstETH,factory/neutron1ug740qrkquxzrk2hh29qrlx3sktkfml3je7juusc2te7xmvsscns0n2wry/wstETH,3616.34,5779.670768739013,7513.571999360713 - // 18 decimals coin - sdk.NewDecCoinFromDec("factory/neutron1ug740qrkquxzrk2hh29qrlx3sktkfml3je7juusc2te7xmvsscns0n2wry/wstETH", math.LegacyMustNewDecFromStr("7513.571999360713").QuoInt64(DecimalsAdjustment)), - - // stATOM,ibc/B7864B03E1B9FD4F049243E92ABD691586F682137037A9F3FCA5222815620B3C,10.268,16.410420329231,21.333546427991 - sdk.NewDecCoinFromDec("ibc/B7864B03E1B9FD4F049243E92ABD691586F682137037A9F3FCA5222815620B3C", math.LegacyMustNewDecFromStr("21.333546427991")), - - // stTIA,ibc/6569E05DEE32B339D9286A52BE33DFCEFC97267F23EF9CFDE0C055140967A9A5,8.52,13.61674924085,17.70177401312 - sdk.NewDecCoinFromDec("ibc/6569E05DEE32B339D9286A52BE33DFCEFC97267F23EF9CFDE0C055140967A9A5", math.LegacyMustNewDecFromStr("17.70177401312")), - - // stkATOM,ibc/3649CE0C8A2C79048D8C6F31FF18FA69C9BC7EB193512E0BD03B733011290445,9.656,15.432315806297,20.062010548187 - sdk.NewDecCoinFromDec("ibc/3649CE0C8A2C79048D8C6F31FF18FA69C9BC7EB193512E0BD03B733011290445", math.LegacyMustNewDecFromStr("20.062010548187")), - - // USDC.noble,ibc/B559A80D62249C8AA07A380E2A2BEA6E5CA9A6F079C912C3A9E9B494105E4F81,1,1.598210004795,2.077673006235 - sdk.NewDecCoinFromDec("ibc/B559A80D62249C8AA07A380E2A2BEA6E5CA9A6F079C912C3A9E9B494105E4F81", math.LegacyMustNewDecFromStr("2.077673006235")), - - // USDC.axl,ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349,1,1.598210004795,2.077673006235 - sdk.NewDecCoinFromDec("ibc/F082B65C88E4B6D5EF1DB243CDA1D331D002759E938A0F5CD3FFDC5D53B3E349", math.LegacyMustNewDecFromStr("2.077673006235")), - - // USDT,ibc/57503D7852EF4E1899FE6D71C5E81D7C839F76580F86F21E39348FC2BC9D7CE2,1,1.598210004795,2.077673006235 - sdk.NewDecCoinFromDec("ibc/57503D7852EF4E1899FE6D71C5E81D7C839F76580F86F21E39348FC2BC9D7CE2", math.LegacyMustNewDecFromStr("2.077673006235")), - - // http://astro.cw/,ibc/5751B8BCDA688FD0A8EC0B292EEF1CDEAB4B766B63EC632778B196D317C40C3A,0.0693,0.110755953332,0.143982739322 - sdk.NewDecCoinFromDec("ibc/5751B8BCDA688FD0A8EC0B292EEF1CDEAB4B766B63EC632778B196D317C40C3A", math.LegacyMustNewDecFromStr("0.143982739322")), - - // ASTRO,factory/neutron1ffus553eet978k024lmssw0czsxwr97mggyv85lpcsdkft8v9ufsz3sa07/astro,0.0693,0.110755953332,0.143982739322 - sdk.NewDecCoinFromDec("factory/neutron1ffus553eet978k024lmssw0czsxwr97mggyv85lpcsdkft8v9ufsz3sa07/astro", math.LegacyMustNewDecFromStr("0.143982739322")), - - // MARS,ibc/9598CDEB7C6DB7FC21E746C8E0250B30CD5154F39CA111A9D4948A4362F638BD,0.0652,0.104203292313,0.135464280003 - sdk.NewDecCoinFromDec("ibc/9598CDEB7C6DB7FC21E746C8E0250B30CD5154F39CA111A9D4948A4362F638BD", math.LegacyMustNewDecFromStr("0.135464280003")), - - // APOLLO,factory/neutron154gg0wtm2v4h9ur8xg32ep64e8ef0g5twlsgvfeajqwghdryvyqsqhgk8e/APOLLO,0.06079,0.097155186191,0.126301742051 - sdk.NewDecCoinFromDec("factory/neutron154gg0wtm2v4h9ur8xg32ep64e8ef0g5twlsgvfeajqwghdryvyqsqhgk8e/APOLLO", math.LegacyMustNewDecFromStr("0.126301742051")), - - // TIA,ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7,8.52,13.61674924085,17.70177401312 - sdk.NewDecCoinFromDec("ibc/773B4D0A3CD667B2275D5A4A7A2F0909C0BA0F4059C0B9181E680DDF4965DCC7", math.LegacyMustNewDecFromStr("17.70177401312")), - - // ATOM,ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9,7.559,12.080869426243,15.705130254103 - sdk.NewDecCoinFromDec("ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9", math.LegacyMustNewDecFromStr("15.705130254103")), - - // axlWETH,ibc/A585C2D15DCD3B010849B453A2CFCB5E213208A5AB665691792684C26274304D,3616.34,5779.670768739013,7513.571999360713 - // 18 decimals coin - sdk.NewDecCoinFromDec("ibc/A585C2D15DCD3B010849B453A2CFCB5E213208A5AB665691792684C26274304D", math.LegacyMustNewDecFromStr("7513.571999360713").QuoInt64(DecimalsAdjustment)), - - // OSMO,ibc/376222D6D9DAE23092E29740E56B758580935A6D77C24C2ABD57A6A78A1F3955,0.6699,1.070640882212,1.391833146872 - sdk.NewDecCoinFromDec("ibc/376222D6D9DAE23092E29740E56B758580935A6D77C24C2ABD57A6A78A1F3955", math.LegacyMustNewDecFromStr("1.391833146872")), - - // DYM,ibc/4A6A46D4263F2ED3DCE9CF866FE15E6903FB5E12D87EB8BDC1B6B1A1E2D397B4,2.329,3.722231101167,4.838900431527 - // 18 decimals coin - sdk.NewDecCoinFromDec("ibc/4A6A46D4263F2ED3DCE9CF866FE15E6903FB5E12D87EB8BDC1B6B1A1E2D397B4", math.LegacyMustNewDecFromStr("4.838900431527").QuoInt64(DecimalsAdjustment)), - - // DYDX,ibc/2CB87BCE0937B1D1DFCEE79BE4501AAF3C265E923509AEAC410AD85D27F35130,1.71,2.732939108199,3.552820840659 - // 18 decimals coin - sdk.NewDecCoinFromDec("ibc/2CB87BCE0937B1D1DFCEE79BE4501AAF3C265E923509AEAC410AD85D27F35130", math.LegacyMustNewDecFromStr("3.552820840659").QuoInt64(DecimalsAdjustment)), - - // KUJI,ibc/1053E271314D36FECBC915B51474F8B3962597CE88FF3E4A74795B0E3F367A8B,1.22,1.949816205849,2.534761067589 - sdk.NewDecCoinFromDec("ibc/1053E271314D36FECBC915B51474F8B3962597CE88FF3E4A74795B0E3F367A8B", math.LegacyMustNewDecFromStr("2.534761067589")), - - // STARS,ibc/A139C0E0B5E87CBA8EAEEB12B9BEE13AC7C814CFBBFA87BBCADD67E31003466C,0.0138,0.022055298066,0.028671887496 - sdk.NewDecCoinFromDec("ibc/A139C0E0B5E87CBA8EAEEB12B9BEE13AC7C814CFBBFA87BBCADD67E31003466C", math.LegacyMustNewDecFromStr("0.028671887496")), - - // AXL,ibc/C0E66D1C81D8AAF0E6896E05190FDFBC222367148F86AC3EA679C28327A763CD,0.802,1.281764423845,1.666293750985 - sdk.NewDecCoinFromDec("ibc/C0E66D1C81D8AAF0E6896E05190FDFBC222367148F86AC3EA679C28327A763CD", math.LegacyMustNewDecFromStr("1.666293750985")), - - // STRD,ibc/3552CECB7BCE1891DB6070D37EC6E954C972B1400141308FCD85FD148BD06DE5,1.542,2.464439827393,3.203771775613 - sdk.NewDecCoinFromDec("ibc/3552CECB7BCE1891DB6070D37EC6E954C972B1400141308FCD85FD148BD06DE5", math.LegacyMustNewDecFromStr("3.203771775613")), -) - -func setDynamicFeesParams(ctx sdk.Context, dfKeeper *dynamicfeeskeeper.Keeper) error { - dfParams := dynamicfeestypes.Params{ - NtrnPrices: NtrnPrices, - } - err := dfKeeper.SetParams(ctx, dfParams) - if err != nil { - return errors.Wrap(err, "failed to set dynamic fees params") - } - - return nil -} - -func setFeeMarketParams(ctx sdk.Context, feemarketKeeper *feemarketkeeper.Keeper) error { - feemarketParams := feemarkettypes.Params{ - Alpha: math.LegacyZeroDec(), - Beta: math.LegacyZeroDec(), - Delta: math.LegacyZeroDec(), - MinBaseGasPrice: math.LegacyMustNewDecFromStr("0.0053"), - MinLearningRate: math.LegacyMustNewDecFromStr("0.08"), - MaxLearningRate: math.LegacyMustNewDecFromStr("0.08"), - MaxBlockUtilization: 30_000_000, - Window: 1, - FeeDenom: appparams.DefaultDenom, - Enabled: true, - DistributeFees: true, - } - feemarketState := feemarkettypes.NewState(feemarketParams.Window, feemarketParams.MinBaseGasPrice, feemarketParams.MinLearningRate) - err := feemarketKeeper.SetParams(ctx, feemarketParams) - if err != nil { - return errors.Wrap(err, "failed to set feemarket params") - } - err = feemarketKeeper.SetState(ctx, feemarketState) - if err != nil { - return errors.Wrap(err, "failed to set feemarket state") - } - - return nil -} - -func setMarketState(ctx sdk.Context, mmKeeper *marketmapkeeper.Keeper) error { - markets := marketMapToDeterministicallyOrderedMarkets(marketmaps.CoreMarketMap) - for _, market := range markets { - if err := mmKeeper.CreateMarket(ctx, market); err != nil { - return err - } - - if err := mmKeeper.Hooks().AfterMarketCreated(ctx, market); err != nil { - return err - } - - } - return nil -} - -func marketMapToDeterministicallyOrderedMarkets(mm marketmaptypes.MarketMap) []marketmaptypes.Market { - markets := make([]marketmaptypes.Market, 0, len(mm.Markets)) - for _, market := range mm.Markets { - markets = append(markets, market) - } - - // order the markets alphabetically by their ticker.String() - sort.Slice(markets, func(i, j int) bool { - return markets[i].Ticker.String() < markets[j].Ticker.String() - }) - - return markets -} - -func enableVoteExtensions(ctx sdk.Context, consensusKeeper *consensuskeeper.Keeper) error { - oldParams, err := consensusKeeper.Params(ctx, &types.QueryParamsRequest{}) - if err != nil { - return err - } - - oldParams.Params.Version = &comettypes.VersionParams{App: 0} - if err := consensusKeeper.ParamsStore.Set(ctx, *oldParams.Params); err != nil { - return err - } - - // we need to enable VoteExtensions for Slinky - oldParams.Params.Abci = &comettypes.ABCIParams{VoteExtensionsEnableHeight: ctx.BlockHeight() + 4} - - updateParamsMsg := types.MsgUpdateParams{ - Authority: authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), - Block: oldParams.Params.Block, - Evidence: oldParams.Params.Evidence, - Validator: oldParams.Params.Validator, - Abci: oldParams.Params.Abci, - } - - _, err = consensusKeeper.UpdateParams(ctx, &updateParamsMsg) - return err -} diff --git a/app/upgrades/v4.0.1/upgrades_test.go b/app/upgrades/v4.0.1/upgrades_test.go deleted file mode 100644 index d05edeeb0..000000000 --- a/app/upgrades/v4.0.1/upgrades_test.go +++ /dev/null @@ -1,145 +0,0 @@ -package v400_test - -import ( - "sort" - "testing" - - "github.com/skip-mev/slinky/cmd/constants/marketmaps" - marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" - - slinkytypes "github.com/skip-mev/slinky/pkg/types" - - upgradetypes "cosmossdk.io/x/upgrade/types" - comettypes "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/stretchr/testify/require" - - "github.com/stretchr/testify/suite" - - v400 "github.com/neutron-org/neutron/v4/app/upgrades/v4.0.1" - "github.com/neutron-org/neutron/v4/testutil" -) - -type UpgradeTestSuite struct { - testutil.IBCConnectionTestSuite -} - -func TestKeeperTestSuite(t *testing.T) { - suite.Run(t, new(UpgradeTestSuite)) -} - -func (suite *UpgradeTestSuite) SetupTest() { - suite.IBCConnectionTestSuite.SetupTest() -} - -func (suite *UpgradeTestSuite) TestOracleUpgrade() { - app := suite.GetNeutronZoneApp(suite.ChainA) - ctx := suite.ChainA.GetContext() - t := suite.T() - - oldParams, err := app.ConsensusParamsKeeper.Params(ctx, &types.QueryParamsRequest{}) - suite.Require().NoError(err) - // it is automatically tracked in upgrade handler, we need to set it manually for tests - oldParams.Params.Version = &comettypes.VersionParams{App: 0} - // we need to properly set consensus params for tests or we get a panic - suite.Require().NoError(app.ConsensusParamsKeeper.ParamsStore.Set(ctx, *oldParams.Params)) - - markets := marketmaps.CoreMarketMap.Markets - suite.Require().NoError(err) - - upgrade := upgradetypes.Plan{ - Name: v400.UpgradeName, - Info: "some text here", - Height: 100, - } - require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade)) - - params, err := app.MarketMapKeeper.GetParams(ctx) - suite.Require().NoError(err) - suite.Require().Equal(params.MarketAuthorities[0], "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z") - suite.Require().Equal(params.MarketAuthorities[1], "neutron1ua63s43u2p4v38pxhcxmps0tj2gudyw2hfeetz") - suite.Require().Equal(params.Admin, "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z") - - // check that the market map was properly set - mm, err := app.MarketMapKeeper.GetAllMarkets(ctx) - gotMM := marketmaptypes.MarketMap{Markets: mm} - suite.Require().NoError(err) - suite.Require().True(marketmaps.CoreMarketMap.Equal(gotMM)) - - numCps, err := app.OracleKeeper.GetNumCurrencyPairs(ctx) - suite.Require().NoError(err) - suite.Require().Equal(numCps, uint64(len(markets))) - - // check that all currency pairs have been initialized in the oracle module - tickers := make([]slinkytypes.CurrencyPair, 0, len(markets)) - for _, market := range markets { - decimals, err := app.OracleKeeper.GetDecimalsForCurrencyPair(ctx, market.Ticker.CurrencyPair) - suite.Require().NoError(err) - suite.Require().Equal(market.Ticker.Decimals, decimals) - - price, err := app.OracleKeeper.GetPriceWithNonceForCurrencyPair(ctx, market.Ticker.CurrencyPair) - suite.Require().NoError(err) - suite.Require().Equal(uint64(0), price.Nonce()) // no nonce because no updates yet - suite.Require().Equal(uint64(0), price.BlockHeight) // no block height because no price written yet - - suite.Require().True(market.Ticker.Enabled) - - tickers = append(tickers, market.Ticker.CurrencyPair) - } - - // check IDs for inserted currency pairs, sort currency-pairs alphabetically - sort.Slice(tickers, func(i, j int) bool { - return tickers[i].String() < tickers[j].String() - }) - - for i, cp := range tickers { - id, found := app.OracleKeeper.GetIDForCurrencyPair(ctx, cp) - suite.Require().True(found) - suite.Require().Equal(uint64(i), id) - } -} - -func (suite *UpgradeTestSuite) TestEnableVoteExtensionsUpgrade() { - app := suite.GetNeutronZoneApp(suite.ChainA) - ctx := suite.ChainA.GetContext() - t := suite.T() - - oldParams, err := app.ConsensusParamsKeeper.Params(ctx, &types.QueryParamsRequest{}) - suite.Require().NoError(err) - - // VoteExtensionsEnableHeight must be updated after the upgrade on upgrade height - // but the rest of params must be the same - oldParams.Params.Abci = &comettypes.ABCIParams{VoteExtensionsEnableHeight: ctx.BlockHeight() + 4} - // it is automatically tracked in upgrade handler, we need to set it manually for tests - oldParams.Params.Version = &comettypes.VersionParams{App: 0} - // we need to properly set consensus params for tests or we get a panic - suite.Require().NoError(app.ConsensusParamsKeeper.ParamsStore.Set(ctx, *oldParams.Params)) - - upgrade := upgradetypes.Plan{ - Name: v400.UpgradeName, - Info: "some text here", - Height: ctx.BlockHeight(), - } - require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade)) - - newParams, err := app.ConsensusParamsKeeper.Params(ctx, &types.QueryParamsRequest{}) - suite.Require().NoError(err) - - suite.Require().Equal(oldParams, newParams) -} - -func (suite *UpgradeTestSuite) TestDynamicFeesUpgrade() { - app := suite.GetNeutronZoneApp(suite.ChainA) - ctx := suite.ChainA.GetContext() - t := suite.T() - - upgrade := upgradetypes.Plan{ - Name: v400.UpgradeName, - Info: "some text here", - Height: 100, - } - require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade)) - - params := app.DynamicFeesKeeper.GetParams(ctx) - suite.Require().Equal(params.NtrnPrices, v400.NtrnPrices) -} diff --git a/app/upgrades/v5.0.0/constants.go b/app/upgrades/v5.0.0/constants.go index 1eeb344c5..bed22a0a6 100644 --- a/app/upgrades/v5.0.0/constants.go +++ b/app/upgrades/v5.0.0/constants.go @@ -1,20 +1,26 @@ -package v400 +package v500 import ( storetypes "cosmossdk.io/store/types" - "github.com/neutron-org/neutron/v4/app/upgrades" + "github.com/neutron-org/neutron/v5/app/upgrades" + ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" ) const ( // UpgradeName defines the on-chain upgrade name. UpgradeName = "v5.0.0" + + MarketMapAuthorityMultisig = "neutron1anjpluecd0tdc0n8xzc3l5hua4h93wyq0x7v56" + // RateLimitContract defines the RL contract addr which we set as a contract address in ibc-rate-limit middleware + // https://neutron.celat.one/neutron-1/contracts/neutron15aqgplxcavqhurr0g5wwtdw6025dknkqwkfh0n46gp2qjl6236cs2yd3nl + RateLimitContract = "neutron15aqgplxcavqhurr0g5wwtdw6025dknkqwkfh0n46gp2qjl6236cs2yd3nl" ) var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, StoreUpgrades: storetypes.StoreUpgrades{ - Added: []string{}, + Added: []string{ibcratelimittypes.ModuleName}, }, } diff --git a/app/upgrades/v5.0.0/upgrades.go b/app/upgrades/v5.0.0/upgrades.go index 9c5e46a57..5bdc9c1b3 100644 --- a/app/upgrades/v5.0.0/upgrades.go +++ b/app/upgrades/v5.0.0/upgrades.go @@ -1,16 +1,22 @@ -package v400 +package v500 import ( "context" "fmt" upgradetypes "cosmossdk.io/x/upgrade/types" + adminmoduletypes "github.com/cosmos/admin-module/v2/x/adminmodule/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" + marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" - "github.com/neutron-org/neutron/v4/app/upgrades" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" + "github.com/neutron-org/neutron/v5/app/upgrades" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" + ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" ) func CreateUpgradeHandler( @@ -38,6 +44,20 @@ func CreateUpgradeHandler( } } + err = setMarketMapParams(ctx, keepers.MarketmapKeeper) + if err != nil { + return nil, err + } + + ctx.Logger().Info("Running ibc-rate-limit upgrades...") + // Only set rate limit contract for mainnet + if ctx.ChainID() == "neutron-1" { + err = upgradeIbcRateLimitSetContract(ctx, *keepers.IbcRateLimitKeeper) + if err != nil { + return nil, err + } + } + ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName)) return vm, nil } @@ -58,3 +78,24 @@ func upgradeDexPause(ctx sdk.Context, k dexkeeper.Keeper) error { return nil } + +func upgradeIbcRateLimitSetContract(ctx sdk.Context, k ibcratelimitkeeper.Keeper) error { + // Set the dex to paused + ctx.Logger().Info("Setting ibc rate limiting contract...") + + if err := k.SetParams(ctx, ibcratelimittypes.Params{ContractAddress: RateLimitContract}); err != nil { + return err + } + + ctx.Logger().Info("Rate limit contract is set") + + return nil +} + +func setMarketMapParams(ctx sdk.Context, marketmapKeeper *marketmapkeeper.Keeper) error { + marketmapParams := marketmaptypes.Params{ + MarketAuthorities: []string{authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), MarketMapAuthorityMultisig}, + Admin: authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(), + } + return marketmapKeeper.SetParams(ctx, marketmapParams) +} diff --git a/app/upgrades/v5.0.0/upgrades_test.go b/app/upgrades/v5.0.0/upgrades_test.go index 0a5d07207..67196ffee 100644 --- a/app/upgrades/v5.0.0/upgrades_test.go +++ b/app/upgrades/v5.0.0/upgrades_test.go @@ -1,18 +1,19 @@ -package v400_test +package v500_test import ( "testing" "cosmossdk.io/math" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - v500 "github.com/neutron-org/neutron/v4/app/upgrades/v5.0.0" - "github.com/neutron-org/neutron/v4/testutil/common/sample" + v500 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.0" + "github.com/neutron-org/neutron/v5/testutil/common/sample" - "github.com/neutron-org/neutron/v4/testutil" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" ) type UpgradeTestSuite struct { @@ -27,6 +28,25 @@ func (suite *UpgradeTestSuite) SetupTest() { suite.IBCConnectionTestSuite.SetupTest() } +func (suite *UpgradeTestSuite) TestOracleUpgrade() { + app := suite.GetNeutronZoneApp(suite.ChainA) + ctx := suite.ChainA.GetContext() + t := suite.T() + + upgrade := upgradetypes.Plan{ + Name: v500.UpgradeName, + Info: "some text here", + Height: 100, + } + require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade)) + + params, err := app.MarketMapKeeper.GetParams(ctx) + suite.Require().NoError(err) + suite.Require().Equal(params.MarketAuthorities[0], "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z") + suite.Require().Equal(params.MarketAuthorities[1], v500.MarketMapAuthorityMultisig) + suite.Require().Equal(params.Admin, "neutron1hxskfdxpp5hqgtjj6am6nkjefhfzj359x0ar3z") +} + func (suite *UpgradeTestSuite) TestUpgradeDexPause() { var ( app = suite.GetNeutronZoneApp(suite.ChainA) @@ -63,3 +83,25 @@ func (suite *UpgradeTestSuite) TestUpgradeDexPause() { suite.ErrorIs(err, dextypes.ErrDexPaused) } + +func (suite *UpgradeTestSuite) TestUpgradeSetRateLimitContract() { + var ( + app = suite.GetNeutronZoneApp(suite.ChainA) + ctx = suite.ChainA.GetContext().WithChainID("neutron-1") + ) + + params := app.RateLimitingICS4Wrapper.IbcratelimitKeeper.GetParams(ctx) + + suite.Equal(params.ContractAddress, "") + + upgrade := upgradetypes.Plan{ + Name: v500.UpgradeName, + Info: "some text here", + Height: 100, + } + suite.NoError(app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade)) + + params = app.RateLimitingICS4Wrapper.IbcratelimitKeeper.GetParams(ctx) + + suite.Equal(params.ContractAddress, v500.RateLimitContract) +} diff --git a/cmd/neutrond/consumer.go b/cmd/neutrond/consumer.go index 6ef10a887..469658269 100644 --- a/cmd/neutrond/consumer.go +++ b/cmd/neutrond/consumer.go @@ -18,7 +18,7 @@ import ( ccvconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/testutil/consumer" + "github.com/neutron-org/neutron/v5/testutil/consumer" ) func AddConsumerSectionCmd(defaultNodeHome string) *cobra.Command { diff --git a/cmd/neutrond/main.go b/cmd/neutrond/main.go index c417d7abb..da06d4cc0 100644 --- a/cmd/neutrond/main.go +++ b/cmd/neutrond/main.go @@ -3,11 +3,11 @@ package main import ( "os" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/neutron-org/neutron/v4/app" + "github.com/neutron-org/neutron/v5/app" ) func main() { diff --git a/cmd/neutrond/root.go b/cmd/neutrond/root.go index 65171611f..10ef9d36c 100644 --- a/cmd/neutrond/root.go +++ b/cmd/neutrond/root.go @@ -39,8 +39,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/app/params" ) // NewRootCmd creates a new root command for neutrond. It is called once in the diff --git a/docs/static/swagger.yaml b/docs/static/swagger.yaml index 96816efe0..cfc211971 100644 --- a/docs/static/swagger.yaml +++ b/docs/static/swagger.yaml @@ -15476,6 +15476,39 @@ definitions: format: uint64 type: string type: object + neutron.contractmanager.QueryFailureResponse: + description: QueryFailureResponse is response type for the Query/Failure RPC method. + properties: + failure: + properties: + address: + title: Address of the failed contract + type: string + error: + title: >- + Redacted error response of the sudo call. Full error is emitted as + an event + type: string + id: + format: uint64 + title: Id of the failure under specific address + type: string + sudo_payload: + format: byte + title: Serialized MessageSudoCallback with Packet and Ack(if exists) + type: string + title: >- + Failure message contains information about ACK failures and can be + used to + + replay ACK in case of requirement. + + Note that Failure means that sudo handler to cosmwasm contract failed + for + + some reason + type: object + type: object neutron.contractmanager.QueryFailuresResponse: description: QueryFailuresResponse is response type for the Query/Failures RPC method. properties: @@ -15548,17 +15581,28 @@ definitions: type: string type: object type: object + neutron.cron.ExecutionStage: + default: EXECUTION_STAGE_END_BLOCKER + description: |- + - EXECUTION_STAGE_END_BLOCKER: Execution at the end of the block + - EXECUTION_STAGE_BEGIN_BLOCKER: Execution at the beginning of the block + enum: + - EXECUTION_STAGE_END_BLOCKER + - EXECUTION_STAGE_BEGIN_BLOCKER + title: Defines when messages will be executed in the block + type: string neutron.cron.MsgExecuteContract: properties: contract: - title: Contract is the address of the smart contract + title: The address of the smart contract type: string msg: - title: Msg is json encoded message to be passed to the contract + title: JSON encoded message to be passed to the contract type: string + title: Defines the contract and the message to pass type: object neutron.cron.Params: - description: Params defines the parameters for the module. + description: Defines the parameters for the module. properties: limit: format: uint64 @@ -15569,9 +15613,20 @@ definitions: type: string type: object neutron.cron.QueryGetScheduleResponse: + description: The response type for the Query/Params RPC method. properties: schedule: properties: + execution_stage: + title: Stage when messages will be executed + default: EXECUTION_STAGE_END_BLOCKER + description: |- + - EXECUTION_STAGE_END_BLOCKER: Execution at the end of the block + - EXECUTION_STAGE_BEGIN_BLOCKER: Execution at the beginning of the block + enum: + - EXECUTION_STAGE_END_BLOCKER + - EXECUTION_STAGE_BEGIN_BLOCKER + type: string last_execute_height: format: uint64 title: Last execution's block height @@ -15580,13 +15635,16 @@ definitions: items: properties: contract: - title: Contract is the address of the smart contract + title: The address of the smart contract type: string msg: - title: Msg is json encoded message to be passed to the contract + title: JSON encoded message to be passed to the contract type: string + title: Defines the contract and the message to pass type: object - title: Msgs that will be executed every period amount of time + title: >- + Msgs that will be executed every certain number of blocks, + specified in the `period` field type: array name: title: Name of schedule @@ -15595,9 +15653,11 @@ definitions: format: uint64 title: Period in blocks type: string + title: Defines the schedule for execution type: object type: object neutron.cron.QueryParamsResponse: + description: The response type for the Query/Params RPC method. properties: params: description: params holds all the parameters of this module. @@ -15612,6 +15672,7 @@ definitions: type: object type: object neutron.cron.QuerySchedulesResponse: + description: The response type for the Query/Params RPC method. properties: pagination: description: |- @@ -15642,6 +15703,16 @@ definitions: schedules: items: properties: + execution_stage: + title: Stage when messages will be executed + default: EXECUTION_STAGE_END_BLOCKER + description: |- + - EXECUTION_STAGE_END_BLOCKER: Execution at the end of the block + - EXECUTION_STAGE_BEGIN_BLOCKER: Execution at the beginning of the block + enum: + - EXECUTION_STAGE_END_BLOCKER + - EXECUTION_STAGE_BEGIN_BLOCKER + type: string last_execute_height: format: uint64 title: Last execution's block height @@ -15650,13 +15721,16 @@ definitions: items: properties: contract: - title: Contract is the address of the smart contract + title: The address of the smart contract type: string msg: - title: Msg is json encoded message to be passed to the contract + title: JSON encoded message to be passed to the contract type: string + title: Defines the contract and the message to pass type: object - title: Msgs that will be executed every period amount of time + title: >- + Msgs that will be executed every certain number of blocks, + specified in the `period` field type: array name: title: Name of schedule @@ -15665,11 +15739,22 @@ definitions: format: uint64 title: Period in blocks type: string + title: Defines the schedule for execution type: object type: array type: object neutron.cron.Schedule: properties: + execution_stage: + title: Stage when messages will be executed + default: EXECUTION_STAGE_END_BLOCKER + description: |- + - EXECUTION_STAGE_END_BLOCKER: Execution at the end of the block + - EXECUTION_STAGE_BEGIN_BLOCKER: Execution at the beginning of the block + enum: + - EXECUTION_STAGE_END_BLOCKER + - EXECUTION_STAGE_BEGIN_BLOCKER + type: string last_execute_height: format: uint64 title: Last execution's block height @@ -15678,13 +15763,16 @@ definitions: items: properties: contract: - title: Contract is the address of the smart contract + title: The address of the smart contract type: string msg: - title: Msg is json encoded message to be passed to the contract + title: JSON encoded message to be passed to the contract type: string + title: Defines the contract and the message to pass type: object - title: Msgs that will be executed every period amount of time + title: >- + Msgs that will be executed every certain number of blocks, specified + in the `period` field type: array name: title: Name of schedule @@ -15693,6 +15781,14 @@ definitions: format: uint64 title: Period in blocks type: string + title: Defines the schedule for execution + type: object + neutron.dex.DepositOptions: + properties: + disable_autoswap: + type: boolean + fail_tx_on_bel: + type: boolean type: object neutron.dex.DepositRecord: properties: @@ -15776,6 +15872,14 @@ definitions: format: int64 type: string type: object + neutron.dex.FailedDeposit: + properties: + deposit_idx: + format: uint64 + type: string + error: + type: string + type: object neutron.dex.LimitOrderTranche: properties: expiration_time: @@ -15873,161 +15977,509 @@ definitions: - JUST_IN_TIME - GOOD_TIL_TIME type: string - neutron.dex.MultiHopRoute: - properties: - hops: - items: - type: string - type: array - type: object - neutron.dex.PairID: - properties: - token0: - type: string - token1: - type: string - type: object - neutron.dex.Params: - description: Params defines the parameters for the module. + neutron.dex.MsgCancelLimitOrder: properties: - fee_tiers: - items: - format: uint64 - type: string - type: array - good_til_purge_allowance: - format: uint64 + creator: type: string - max_jits_per_block: - format: uint64 + tranche_key: type: string - paused: - type: boolean type: object - neutron.dex.Pool: + neutron.dex.MsgCancelLimitOrderResponse: properties: - id: - format: uint64 - type: string - lower_tick0: + maker_coin_out: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + amount: type: string - reserves_maker_denom: + denom: type: string type: object - upper_tick1: + title: Total amount of maker reserves that were canceled + taker_coin_out: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + amount: type: string - reserves_maker_denom: + denom: type: string type: object + title: Total amount of taker reserves that were withdrawn type: object - neutron.dex.PoolMetadata: + neutron.dex.MsgDeposit: properties: - fee: - format: uint64 + amounts_a: + items: + type: string + type: array + amounts_b: + items: + type: string + type: array + creator: type: string - id: - format: uint64 + fees: + items: + format: uint64 + type: string + type: array + options: + items: + properties: + disable_autoswap: + type: boolean + fail_tx_on_bel: + type: boolean + type: object + type: array + receiver: type: string - pair_id: - properties: - token0: - type: string - token1: - type: string - type: object - tick: - format: int64 + tick_indexes_a_to_b: + items: + format: int64 + type: string + type: array + token_a: + type: string + token_b: type: string type: object - neutron.dex.PoolReserves: + neutron.dex.MsgDepositResponse: properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: + failed_deposits: + items: + properties: + deposit_idx: + format: uint64 + type: string + error: + type: string + type: object + type: array + reserve0_deposited: + items: + type: string + type: array + reserve1_deposited: + items: + type: string + type: array + shares_issued: + items: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array + type: object + neutron.dex.MsgMultiHopSwap: + properties: + amount_in: type: string - price_taker_to_maker: + creator: type: string - reserves_maker_denom: + exit_limit_price: + type: string + pick_best_route: + description: >- + If pickBestRoute == true then all routes are run and the route with + the + + best price is chosen otherwise, the first succesful route is used. + type: boolean + receiver: type: string + routes: + items: + properties: + hops: + items: + type: string + type: array + type: object + type: array type: object - neutron.dex.PoolReservesKey: + neutron.dex.MsgMultiHopSwapResponse: properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: + coin_out: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. properties: - maker_denom: + amount: type: string - taker_denom: + denom: type: string type: object - type: object - neutron.dex.QueryAllInactiveLimitOrderTrancheResponse: - properties: - inactive_limit_order_tranche: + dust: items: - properties: - expiration_time: - format: date-time - title: >- + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array + route: + properties: + hops: + items: + type: string + type: array + type: object + type: object + neutron.dex.MsgPlaceLimitOrder: + properties: + amount_in: + type: string + creator: + type: string + expiration_time: + description: expirationTime is only valid iff orderType == GOOD_TIL_TIME. + format: date-time + type: string + limit_sell_price: + type: string + max_amount_out: + type: string + order_type: + default: GOOD_TIL_CANCELLED + enum: + - GOOD_TIL_CANCELLED + - FILL_OR_KILL + - IMMEDIATE_OR_CANCEL + - JUST_IN_TIME + - GOOD_TIL_TIME + type: string + receiver: + type: string + tick_index_in_to_out: + description: >- + DEPRECATED: tick_index_in_to_out will be removed in future release; + limit_sell_price should be used instead. + format: int64 + type: string + token_in: + type: string + token_out: + type: string + type: object + neutron.dex.MsgPlaceLimitOrderResponse: + properties: + coin_in: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of coin used for the limit order + taker_coin_in: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of the token in that was immediately swapped for + takerOutCoin + taker_coin_out: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of coin received from the taker portion of the limit + order + + This is the amount of coin immediately available in the users account + after + + executing the limit order. It does not include any future proceeds + from the + + maker portion which will have withdrawn in the future + trancheKey: + type: string + type: object + neutron.dex.MsgWithdrawFilledLimitOrder: + properties: + creator: + type: string + tranche_key: + type: string + type: object + neutron.dex.MsgWithdrawFilledLimitOrderResponse: + properties: + maker_coin_out: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of maker reserves that were withdrawn --only applies to + inactive LimitOrders + taker_coin_out: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of taker reserves that were withdrawn + type: object + neutron.dex.MsgWithdrawal: + properties: + creator: + type: string + fees: + items: + format: uint64 + type: string + type: array + receiver: + type: string + shares_to_remove: + items: + type: string + type: array + tick_indexes_a_to_b: + items: + format: int64 + type: string + type: array + token_a: + type: string + token_b: + type: string + type: object + neutron.dex.MsgWithdrawalResponse: + properties: + reserve0_withdrawn: + type: string + reserve1_withdrawn: + type: string + shares_burned: + items: + description: |- + Coin defines a token with a denomination and an amount. + + NOTE: The amount field is an Int which implements the custom method + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array + type: object + neutron.dex.MultiHopRoute: + properties: + hops: + items: + type: string + type: array + type: object + neutron.dex.PairID: + properties: + token0: + type: string + token1: + type: string + type: object + neutron.dex.Params: + description: Params defines the parameters for the module. + properties: + fee_tiers: + items: + format: uint64 + type: string + type: array + good_til_purge_allowance: + format: uint64 + type: string + max_jits_per_block: + format: uint64 + type: string + paused: + type: boolean + type: object + neutron.dex.Pool: + properties: + id: + format: uint64 + type: string + lower_tick0: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + upper_tick1: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + type: object + neutron.dex.PoolMetadata: + properties: + fee: + format: uint64 + type: string + id: + format: uint64 + type: string + pair_id: + properties: + token0: + type: string + token1: + type: string + type: object + tick: + format: int64 + type: string + type: object + neutron.dex.PoolReserves: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + neutron.dex.PoolReservesKey: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + neutron.dex.QueryAllInactiveLimitOrderTrancheResponse: + properties: + inactive_limit_order_tranche: + items: + properties: + expiration_time: + format: date-time + title: >- JIT orders also use expiration_time to handle deletion but represent a special case @@ -16871,67 +17323,326 @@ definitions: max_jits_per_block: format: uint64 type: string - paused: - type: boolean + paused: + type: boolean + type: object + type: object + neutron.dex.QueryPoolResponse: + properties: + pool: + properties: + id: + format: uint64 + type: string + lower_tick0: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + upper_tick1: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + type: object + type: object + neutron.dex.QuerySimulateCancelLimitOrderResponse: + properties: + resp: + properties: + maker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of maker reserves that were canceled + taker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of taker reserves that were withdrawn + type: object + type: object + neutron.dex.QuerySimulateDepositResponse: + properties: + resp: + properties: + failed_deposits: + items: + properties: + deposit_idx: + format: uint64 + type: string + error: + type: string + type: object + type: array + reserve0_deposited: + items: + type: string + type: array + reserve1_deposited: + items: + type: string + type: array + shares_issued: + items: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array + type: object + type: object + neutron.dex.QuerySimulateMultiHopSwapResponse: + properties: + resp: + properties: + coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + dust: + items: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array + route: + properties: + hops: + items: + type: string + type: array + type: object + type: object + type: object + neutron.dex.QuerySimulatePlaceLimitOrderResponse: + properties: + resp: + properties: + coin_in: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of coin used for the limit order + taker_coin_in: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of the token in that was immediately swapped for + takerOutCoin + taker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of coin received from the taker portion of the limit + order + + This is the amount of coin immediately available in the users + account after + + executing the limit order. It does not include any future proceeds + from the + + maker portion which will have withdrawn in the future + trancheKey: + type: string type: object type: object - neutron.dex.QueryPoolResponse: + neutron.dex.QuerySimulateWithdrawFilledLimitOrderResponse: properties: - pool: + resp: properties: - id: - format: uint64 - type: string - lower_tick0: + maker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + amount: type: string - reserves_maker_denom: + denom: type: string type: object - upper_tick1: + title: >- + Total amount of maker reserves that were withdrawn --only applies + to inactive LimitOrders + taker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + amount: type: string - reserves_maker_denom: + denom: type: string type: object + title: Total amount of taker reserves that were withdrawn + type: object + type: object + neutron.dex.QuerySimulateWithdrawalResponse: + properties: + resp: + properties: + reserve0_withdrawn: + type: string + reserve1_withdrawn: + type: string + shares_burned: + items: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array type: object type: object neutron.dex.TickLiquidity: @@ -17636,6 +18347,16 @@ definitions: neutron.interchainqueries.Params: description: Params defines the parameters for the module. properties: + max_kv_query_keys_count: + format: uint64 + title: Maximum amount of keys in a registered key value query + type: string + max_transactions_filters: + format: uint64 + title: >- + max_transactions_filters defines maximum allowed amount of tx filters + in msgRegisterInterchainQuery + type: string query_deposit: description: Amount of coins deposited for the query. items: @@ -17681,6 +18402,16 @@ definitions: params: description: params holds all the parameters of this module. properties: + max_kv_query_keys_count: + format: uint64 + title: Maximum amount of keys in a registered key value query + type: string + max_transactions_filters: + format: uint64 + title: >- + max_transactions_filters defines maximum allowed amount of tx + filters in msgRegisterInterchainQuery + type: string query_deposit: description: Amount of coins deposited for the query. items: @@ -23461,7 +24192,7 @@ definitions: type: object info: title: Neutron - version: v4 + version: v5 paths: /block-sdk/auction/v1/params: get: @@ -39200,41 +39931,201 @@ paths: amount. - NOTE: The amount field is an Int which implements - the custom method + NOTE: The amount field is an Int which implements + the custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: the packet receive fee + type: array + timeout_fee: + items: + description: >- + Coin defines a token with a denomination and an + amount. + + + NOTE: The amount field is an Int which implements + the custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: the packet timeout fee + type: array + title: >- + Fee defines the ICS29 receive, acknowledgement and timeout + fees + type: object + type: object + type: object + default: + description: An unexpected error response. + schema: + properties: + code: + format: int32 + type: integer + details: + items: + properties: + type_url: + type: string + value: + format: byte + type: string + type: object + type: array + error: + type: string + message: + type: string + type: object + summary: Parameters queries the parameters of the module. + tags: + - Query + /neutron/contractmanager/failures: + get: + operationId: Failures + parameters: + - description: address of the contract which Sudo call failed. + in: query + name: address + required: false + type: string + - description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + format: byte + in: query + name: pagination.key + required: false + type: string + - description: >- + offset is a numeric offset that can be used when key is unavailable. + + It is less efficient than using key. Only one of offset or key + should + + be set. + format: uint64 + in: query + name: pagination.offset + required: false + type: string + - description: >- + limit is the total number of results to be returned in the result + page. + + If left empty it will default to a value to be set by each app. + format: uint64 + in: query + name: pagination.limit + required: false + type: string + - description: >- + count_total is set to true to indicate that the result set should + include + + a count of the total number of items available for pagination in + UIs. + + count_total is only respected when offset is used. It is ignored + when key + + is set. + in: query + name: pagination.count_total + required: false + type: boolean + - description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + name: pagination.reverse + required: false + type: boolean + responses: + '200': + description: A successful response. + schema: + description: >- + QueryFailuresResponse is response type for the Query/Failures RPC + method. + properties: + failures: + items: + properties: + address: + title: Address of the failed contract + type: string + error: + title: >- + Redacted error response of the sudo call. Full error is + emitted as an event + type: string + id: + format: uint64 + title: Id of the failure under specific address + type: string + sudo_payload: + format: byte + title: >- + Serialized MessageSudoCallback with Packet and Ack(if + exists) + type: string + title: >- + Failure message contains information about ACK failures and + can be used to + + replay ACK in case of requirement. - signatures required by gogoproto. - properties: - amount: - type: string - denom: - type: string - type: object - title: the packet receive fee - type: array - timeout_fee: - items: - description: >- - Coin defines a token with a denomination and an - amount. + Note that Failure means that sudo handler to cosmwasm + contract failed for + some reason + type: object + type: array + pagination: + description: >- + PageResponse is to be embedded in gRPC response messages where + the - NOTE: The amount field is an Int which implements - the custom method + corresponding request message has used PageRequest. - signatures required by gogoproto. - properties: - amount: - type: string - denom: - type: string - type: object - title: the packet timeout fee - type: array + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } + properties: + next_key: + description: |- + next_key is the key to be passed to PageRequest.key to + query the next page most efficiently. It will be empty if + there are no more results. + format: byte + type: string + total: + format: uint64 title: >- - Fee defines the ICS29 receive, acknowledgement and timeout - fees - type: object + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise + type: string type: object type: object default: @@ -39259,23 +40150,17 @@ paths: message: type: string type: object - summary: Parameters queries the parameters of the module. + summary: Queries a list of Failures occurred on the network. tags: - Query - /neutron/contractmanager/failures: + /neutron/contractmanager/failures/{address}: get: - operationId: Failures + operationId: AddressFailures parameters: - description: address of the contract which Sudo call failed. - in: query + in: path name: address - required: false - type: string - - description: ID of the failure for the given contract. - format: uint64 - in: query - name: failure_id - required: false + required: true type: string - description: |- key is a value returned in PageResponse.next_key to begin @@ -39425,24 +40310,183 @@ paths: message: type: string type: object - summary: Queries a list of Failures occurred on the network. + summary: Queries Failures by contract address. + tags: + - Query + /neutron/contractmanager/failures/{address}/{failure_id}: + get: + operationId: AddressFailure + parameters: + - description: address of the contract which Sudo call failed. + in: path + name: address + required: true + type: string + - description: ID of the failure for the given contract. + format: uint64 + in: path + name: failure_id + required: true + type: string + responses: + '200': + description: A successful response. + schema: + description: >- + QueryFailureResponse is response type for the Query/Failure RPC + method. + properties: + failure: + properties: + address: + title: Address of the failed contract + type: string + error: + title: >- + Redacted error response of the sudo call. Full error is + emitted as an event + type: string + id: + format: uint64 + title: Id of the failure under specific address + type: string + sudo_payload: + format: byte + title: >- + Serialized MessageSudoCallback with Packet and Ack(if + exists) + type: string + title: >- + Failure message contains information about ACK failures and + can be used to + + replay ACK in case of requirement. + + Note that Failure means that sudo handler to cosmwasm contract + failed for + + some reason + type: object + type: object + default: + description: An unexpected error response. + schema: + properties: + code: + format: int32 + type: integer + details: + items: + properties: + type_url: + type: string + value: + format: byte + type: string + type: object + type: array + error: + type: string + message: + type: string + type: object + summary: Queries a Failure by contract address and failure ID. + tags: + - Query + /neutron/contractmanager/params: + get: + operationId: Params + responses: + '200': + description: A successful response. + schema: + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + properties: + params: + description: params holds all the parameters of this module. + properties: + sudo_call_gas_limit: + format: uint64 + type: string + type: object + type: object + default: + description: An unexpected error response. + schema: + properties: + code: + format: int32 + type: integer + details: + items: + properties: + type_url: + type: string + value: + format: byte + type: string + type: object + type: array + error: + type: string + message: + type: string + type: object + summary: Parameters queries the parameters of the module. + tags: + - Query + /neutron/cron/params: + get: + operationId: Params + responses: + '200': + description: A successful response. + schema: + description: The response type for the Query/Params RPC method. + properties: + params: + description: params holds all the parameters of this module. + properties: + limit: + format: uint64 + title: Limit of schedules executed in one block + type: string + security_address: + title: Security address that can remove schedules + type: string + type: object + type: object + default: + description: An unexpected error response. + schema: + properties: + code: + format: int32 + type: integer + details: + items: + properties: + type_url: + type: string + value: + format: byte + type: string + type: object + type: array + error: + type: string + message: + type: string + type: object + summary: Queries the parameters of the module. tags: - Query - /neutron/contractmanager/failures/{address}: + /neutron/cron/schedule: get: - operationId: AddressFailures + operationId: Schedules parameters: - - description: address of the contract which Sudo call failed. - in: path - name: address - required: true - type: string - - description: ID of the failure for the given contract. - format: uint64 - in: query - name: failure_id - required: false - type: string - description: |- key is a value returned in PageResponse.next_key to begin querying the next page most efficiently. Only one of offset or key @@ -39503,43 +40547,8 @@ paths: '200': description: A successful response. schema: - description: >- - QueryFailuresResponse is response type for the Query/Failures RPC - method. + description: The response type for the Query/Params RPC method. properties: - failures: - items: - properties: - address: - title: Address of the failed contract - type: string - error: - title: >- - Redacted error response of the sudo call. Full error is - emitted as an event - type: string - id: - format: uint64 - title: Id of the failure under specific address - type: string - sudo_payload: - format: byte - title: >- - Serialized MessageSudoCallback with Packet and Ack(if - exists) - type: string - title: >- - Failure message contains information about ACK failures and - can be used to - - replay ACK in case of requirement. - - Note that Failure means that sudo handler to cosmwasm - contract failed for - - some reason - type: object - type: array pagination: description: >- PageResponse is to be embedded in gRPC response messages where @@ -39568,6 +40577,49 @@ paths: was set, its value is undefined otherwise type: string type: object + schedules: + items: + properties: + execution_stage: + title: Stage when messages will be executed + default: EXECUTION_STAGE_END_BLOCKER + description: >- + - EXECUTION_STAGE_END_BLOCKER: Execution at the end of + the block + - EXECUTION_STAGE_BEGIN_BLOCKER: Execution at the beginning of the block + enum: + - EXECUTION_STAGE_END_BLOCKER + - EXECUTION_STAGE_BEGIN_BLOCKER + type: string + last_execute_height: + format: uint64 + title: Last execution's block height + type: string + msgs: + items: + properties: + contract: + title: The address of the smart contract + type: string + msg: + title: JSON encoded message to be passed to the contract + type: string + title: Defines the contract and the message to pass + type: object + title: >- + Msgs that will be executed every certain number of + blocks, specified in the `period` field + type: array + name: + title: Name of schedule + type: string + period: + format: uint64 + title: Period in blocks + type: string + title: Defines the schedule for execution + type: object + type: array type: object default: description: An unexpected error response. @@ -39591,148 +40643,63 @@ paths: message: type: string type: object - summary: Queries Failures by contract address. + summary: Queries a list of Schedule items. tags: - Query - /neutron/contractmanager/failures/{address}/{failure_id}: + /neutron/cron/schedule/{name}: get: - operationId: AddressFailure + operationId: Schedule parameters: - - description: address of the contract which Sudo call failed. - in: path - name: address - required: true - type: string - - description: ID of the failure for the given contract. - format: uint64 - in: path - name: failure_id + - in: path + name: name required: true type: string - - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - format: byte - in: query - name: pagination.key - required: false - type: string - - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - format: uint64 - in: query - name: pagination.offset - required: false - type: string - - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - format: uint64 - in: query - name: pagination.limit - required: false - type: string - - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. - in: query - name: pagination.count_total - required: false - type: boolean - - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - name: pagination.reverse - required: false - type: boolean responses: '200': description: A successful response. schema: - description: >- - QueryFailuresResponse is response type for the Query/Failures RPC - method. + description: The response type for the Query/Params RPC method. properties: - failures: - items: - properties: - address: - title: Address of the failed contract - type: string - error: - title: >- - Redacted error response of the sudo call. Full error is - emitted as an event - type: string - id: - format: uint64 - title: Id of the failure under specific address - type: string - sudo_payload: - format: byte - title: >- - Serialized MessageSudoCallback with Packet and Ack(if - exists) - type: string - title: >- - Failure message contains information about ACK failures and - can be used to - - replay ACK in case of requirement. - - Note that Failure means that sudo handler to cosmwasm - contract failed for - - some reason - type: object - type: array - pagination: - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. - - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } + schedule: properties: - next_key: - description: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently. It will be empty if - there are no more results. - format: byte + execution_stage: + title: Stage when messages will be executed + default: EXECUTION_STAGE_END_BLOCKER + description: >- + - EXECUTION_STAGE_END_BLOCKER: Execution at the end of the + block + - EXECUTION_STAGE_BEGIN_BLOCKER: Execution at the beginning of the block + enum: + - EXECUTION_STAGE_END_BLOCKER + - EXECUTION_STAGE_BEGIN_BLOCKER type: string - total: + last_execute_height: format: uint64 + title: Last execution's block height + type: string + msgs: + items: + properties: + contract: + title: The address of the smart contract + type: string + msg: + title: JSON encoded message to be passed to the contract + type: string + title: Defines the contract and the message to pass + type: object title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise + Msgs that will be executed every certain number of blocks, + specified in the `period` field + type: array + name: + title: Name of schedule + type: string + period: + format: uint64 + title: Period in blocks type: string + title: Defines the schedule for execution type: object type: object default: @@ -39757,25 +40724,57 @@ paths: message: type: string type: object - summary: Queries a Failure by contract address and failure ID. + summary: Queries a Schedule by name. tags: - Query - /neutron/contractmanager/params: + /neutron/dex/estimate_multi_hop_swap: get: - operationId: Params + operationId: EstimateMultiHopSwap + parameters: + - description: 'DEPRECATED: Use QuerySimulateMultiHopSwap.' + in: query + name: creator + required: false + type: string + - in: query + name: receiver + required: false + type: string + - in: query + name: amount_in + required: false + type: string + - in: query + name: exit_limit_price + required: false + type: string + - description: >- + If pickBestRoute == true then all routes are run and the route with + the + + best price is chosen otherwise, the first succesful route is used. + in: query + name: pick_best_route + required: false + type: boolean responses: '200': description: A successful response. schema: - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. properties: - params: - description: params holds all the parameters of this module. + coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. properties: - sudo_call_gas_limit: - format: uint64 + amount: + type: string + denom: type: string type: object type: object @@ -39801,28 +40800,131 @@ paths: message: type: string type: object - summary: Parameters queries the parameters of the module. + summary: DEPRECATED Queries the simulated result of a multihop swap tags: - Query - /neutron/cron/params: + /neutron/dex/estimate_place_limit_order: get: - operationId: Params + operationId: EstimatePlaceLimitOrder + parameters: + - description: 'DEPRECATED: Use QuerySimulatePlaceLimitOrder.' + in: query + name: creator + required: false + type: string + - in: query + name: receiver + required: false + type: string + - in: query + name: token_in + required: false + type: string + - in: query + name: token_out + required: false + type: string + - format: int64 + in: query + name: tick_index_in_to_out + required: false + type: string + - in: query + name: amount_in + required: false + type: string + - default: GOOD_TIL_CANCELLED + enum: + - GOOD_TIL_CANCELLED + - FILL_OR_KILL + - IMMEDIATE_OR_CANCEL + - JUST_IN_TIME + - GOOD_TIL_TIME + in: query + name: order_type + required: false + type: string + - description: expirationTime is only valid iff orderType == GOOD_TIL_TIME. + format: date-time + in: query + name: expiration_time + required: false + type: string + - in: query + name: maxAmount_out + required: false + type: string responses: '200': description: A successful response. schema: properties: - params: - description: params holds all the parameters of this module. + swap_in_coin: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. properties: - limit: - format: uint64 - title: Limit of schedules executed in one block + amount: type: string - security_address: - title: Security address that can remove schedules + denom: + type: string + type: object + title: >- + Total amount of the token in that was immediately swapped for + swapOutCoin + swap_out_coin: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of coin received from the taker portion of the + limit order + + This is the amount of coin immediately available in the users + account after + + executing the limit order. It does not include any future + proceeds from the + + maker portion which will have withdrawn in the future + total_in_coin: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the custom + method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: type: string type: object + title: >- + Total amount of coin used for the limit order + + You can derive makerLimitInCoin using the equation: + totalInCoin = + + swapInCoin + makerLimitInCoin type: object default: description: An unexpected error response. @@ -39846,12 +40948,12 @@ paths: message: type: string type: object - summary: Queries the parameters of the module. + summary: DEPRECATED Queries the simulated result of a PlaceLimit order tags: - Query - /neutron/cron/schedule: + /neutron/dex/filled_limit_order_tranche: get: - operationId: Schedules + operationId: InactiveLimitOrderTrancheAll2 parameters: - description: |- key is a value returned in PageResponse.next_key to begin @@ -39914,6 +41016,48 @@ paths: description: A successful response. schema: properties: + inactive_limit_order_tranche: + items: + properties: + expiration_time: + format: date-time + title: >- + JIT orders also use expiration_time to handle deletion + but represent a special case + + All JIT orders have a expiration_time of 0 and an + exception is made to still treat these orders as live + + Order deletion still functions the same and the orders + will be deleted at the end of the block + type: string + key: + properties: + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + tranche_key: + type: string + type: object + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + reserves_taker_denom: + type: string + total_maker_denom: + type: string + total_taker_denom: + type: string + type: object + type: array pagination: description: >- PageResponse is to be embedded in gRPC response messages where @@ -39942,36 +41086,6 @@ paths: was set, its value is undefined otherwise type: string type: object - schedules: - items: - properties: - last_execute_height: - format: uint64 - title: Last execution's block height - type: string - msgs: - items: - properties: - contract: - title: Contract is the address of the smart contract - type: string - msg: - title: >- - Msg is json encoded message to be passed to the - contract - type: string - type: object - title: Msgs that will be executed every period amount of time - type: array - name: - title: Name of schedule - type: string - period: - format: uint64 - title: Period in blocks - type: string - type: object - type: array type: object default: description: An unexpected error response. @@ -39995,15 +41109,28 @@ paths: message: type: string type: object - summary: Queries a list of Schedule items. + summary: Queries a list of InactiveLimitOrderTranche items. tags: - Query - /neutron/cron/schedule/{name}: + /neutron/dex/filled_limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}: get: - operationId: Schedule + operationId: InactiveLimitOrderTranche2 parameters: - in: path - name: name + name: pair_id + required: true + type: string + - in: path + name: token_in + required: true + type: string + - format: int64 + in: path + name: tick_index + required: true + type: string + - in: path + name: tranche_key required: true type: string responses: @@ -40011,32 +41138,44 @@ paths: description: A successful response. schema: properties: - schedule: + inactive_limit_order_tranche: properties: - last_execute_height: - format: uint64 - title: Last execution's block height + expiration_time: + format: date-time + title: >- + JIT orders also use expiration_time to handle deletion but + represent a special case + + All JIT orders have a expiration_time of 0 and an + exception is made to still treat these orders as live + + Order deletion still functions the same and the orders + will be deleted at the end of the block type: string - msgs: - items: - properties: - contract: - title: Contract is the address of the smart contract - type: string - msg: - title: >- - Msg is json encoded message to be passed to the - contract - type: string - type: object - title: Msgs that will be executed every period amount of time - type: array - name: - title: Name of schedule + key: + properties: + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + tranche_key: + type: string + type: object + price_taker_to_maker: type: string - period: - format: uint64 - title: Period in blocks + reserves_maker_denom: + type: string + reserves_taker_denom: + type: string + total_maker_denom: + type: string + total_taker_denom: type: string type: object type: object @@ -40062,36 +41201,67 @@ paths: message: type: string type: object - summary: Queries a Schedule by name. + summary: Queries a InactiveLimitOrderTranche by index. tags: - Query - /neutron/dex/estimate_multi_hop_swap: + /neutron/dex/inactive_limit_order_tranche: get: - operationId: EstimateMultiHopSwap + operationId: InactiveLimitOrderTrancheAll parameters: - - in: query - name: creator + - description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + format: byte + in: query + name: pagination.key required: false type: string - - in: query - name: receiver + - description: >- + offset is a numeric offset that can be used when key is unavailable. + + It is less efficient than using key. Only one of offset or key + should + + be set. + format: uint64 + in: query + name: pagination.offset required: false type: string - - in: query - name: amount_in + - description: >- + limit is the total number of results to be returned in the result + page. + + If left empty it will default to a value to be set by each app. + format: uint64 + in: query + name: pagination.limit required: false type: string - - in: query - name: exit_limit_price + - description: >- + count_total is set to true to indicate that the result set should + include + + a count of the total number of items available for pagination in + UIs. + + count_total is only respected when offset is used. It is ignored + when key + + is set. + in: query + name: pagination.count_total required: false - type: string + type: boolean - description: >- - If pickBestRoute == true then all routes are run and the route with - the + reverse is set to true if results are to be returned in the + descending order. - best price is chosen otherwise, the first succesful route is used. + + Since: cosmos-sdk 0.43 in: query - name: pick_best_route + name: pagination.reverse required: false type: boolean responses: @@ -40099,19 +41269,74 @@ paths: description: A successful response. schema: properties: - coin_out: - description: >- - Coin defines a token with a denomination and an amount. + inactive_limit_order_tranche: + items: + properties: + expiration_time: + format: date-time + title: >- + JIT orders also use expiration_time to handle deletion + but represent a special case + All JIT orders have a expiration_time of 0 and an + exception is made to still treat these orders as live - NOTE: The amount field is an Int which implements the custom - method + Order deletion still functions the same and the orders + will be deleted at the end of the block + type: string + key: + properties: + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + tranche_key: + type: string + type: object + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + reserves_taker_denom: + type: string + total_maker_denom: + type: string + total_taker_denom: + type: string + type: object + type: array + pagination: + description: >- + PageResponse is to be embedded in gRPC response messages where + the - signatures required by gogoproto. + corresponding request message has used PageRequest. + + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } properties: - amount: + next_key: + description: |- + next_key is the key to be passed to PageRequest.key to + query the next page most efficiently. It will be empty if + there are no more results. + format: byte type: string - denom: + total: + format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise type: string type: object type: object @@ -40137,130 +41362,75 @@ paths: message: type: string type: object - summary: Queries the simulated result of a multihop swap + summary: Queries a list of InactiveLimitOrderTranche items. tags: - Query - /neutron/dex/estimate_place_limit_order: + /neutron/dex/inactive_limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}: get: - operationId: EstimatePlaceLimitOrder + operationId: InactiveLimitOrderTranche parameters: - - in: query - name: creator - required: false - type: string - - in: query - name: receiver - required: false + - in: path + name: pair_id + required: true type: string - - in: query + - in: path name: token_in - required: false - type: string - - in: query - name: token_out - required: false + required: true type: string - format: int64 - in: query - name: tick_index_in_to_out - required: false - type: string - - in: query - name: amount_in - required: false - type: string - - default: GOOD_TIL_CANCELLED - enum: - - GOOD_TIL_CANCELLED - - FILL_OR_KILL - - IMMEDIATE_OR_CANCEL - - JUST_IN_TIME - - GOOD_TIL_TIME - in: query - name: order_type - required: false - type: string - - description: expirationTime is only valid iff orderType == GOOD_TIL_TIME. - format: date-time - in: query - name: expiration_time - required: false + in: path + name: tick_index + required: true type: string - - in: query - name: maxAmount_out - required: false + - in: path + name: tranche_key + required: true type: string responses: '200': description: A successful response. schema: properties: - swap_in_coin: - description: >- - Coin defines a token with a denomination and an amount. - - - NOTE: The amount field is an Int which implements the custom - method - - signatures required by gogoproto. + inactive_limit_order_tranche: properties: - amount: - type: string - denom: - type: string - type: object - title: >- - Total amount of the token in that was immediately swapped for - swapOutCoin - swap_out_coin: - description: >- - Coin defines a token with a denomination and an amount. - + expiration_time: + format: date-time + title: >- + JIT orders also use expiration_time to handle deletion but + represent a special case - NOTE: The amount field is an Int which implements the custom - method + All JIT orders have a expiration_time of 0 and an + exception is made to still treat these orders as live - signatures required by gogoproto. - properties: - amount: + Order deletion still functions the same and the orders + will be deleted at the end of the block type: string - denom: + key: + properties: + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + tranche_key: + type: string + type: object + price_taker_to_maker: type: string - type: object - title: >- - Total amount of coin received from the taker portion of the - limit order - - This is the amount of coin immediately available in the users - account after - - executing the limit order. It does not include any future - proceeds from the - - maker portion which will have withdrawn in the future - total_in_coin: - description: >- - Coin defines a token with a denomination and an amount. - - - NOTE: The amount field is an Int which implements the custom - method - - signatures required by gogoproto. - properties: - amount: + reserves_maker_denom: type: string - denom: + reserves_taker_denom: + type: string + total_maker_denom: + type: string + total_taker_denom: type: string type: object - title: >- - Total amount of coin used for the limit order - - You can derive makerLimitInCoin using the equation: - totalInCoin = - - swapInCoin + makerLimitInCoin type: object default: description: An unexpected error response. @@ -40284,13 +41454,21 @@ paths: message: type: string type: object - summary: Queries the simulated result of a PlaceLimit order + summary: Queries a InactiveLimitOrderTranche by index. tags: - Query - /neutron/dex/filled_limit_order_tranche: + /neutron/dex/limit_order_tranche/{pair_id}/{token_in}: get: - operationId: InactiveLimitOrderTrancheAll2 + operationId: LimitOrderTrancheAll parameters: + - in: path + name: pair_id + required: true + type: string + - in: path + name: token_in + required: true + type: string - description: |- key is a value returned in PageResponse.next_key to begin querying the next page most efficiently. Only one of offset or key @@ -40352,7 +41530,7 @@ paths: description: A successful response. schema: properties: - inactive_limit_order_tranche: + limit_order_tranche: items: properties: expiration_time: @@ -40445,12 +41623,14 @@ paths: message: type: string type: object - summary: Queries a list of InactiveLimitOrderTranche items. + summary: |- + Queries a list of LimitOrderTranche items for a given pairID / TokenIn + combination. tags: - Query - /neutron/dex/filled_limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}: + /neutron/dex/limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}: get: - operationId: InactiveLimitOrderTranche2 + operationId: LimitOrderTranche parameters: - in: path name: pair_id @@ -40474,7 +41654,7 @@ paths: description: A successful response. schema: properties: - inactive_limit_order_tranche: + limit_order_tranche: properties: expiration_time: format: date-time @@ -40537,12 +41717,12 @@ paths: message: type: string type: object - summary: Queries a InactiveLimitOrderTranche by index. + summary: Queries a LimitOrderTranche by index. tags: - Query - /neutron/dex/inactive_limit_order_tranche: + /neutron/dex/limit_order_tranche_user: get: - operationId: InactiveLimitOrderTrancheAll + operationId: LimitOrderTrancheUserAll parameters: - description: |- key is a value returned in PageResponse.next_key to begin @@ -40605,45 +41785,38 @@ paths: description: A successful response. schema: properties: - inactive_limit_order_tranche: + limit_order_tranche_user: items: properties: - expiration_time: - format: date-time - title: >- - JIT orders also use expiration_time to handle deletion - but represent a special case - - All JIT orders have a expiration_time of 0 and an - exception is made to still treat these orders as live - - Order deletion still functions the same and the orders - will be deleted at the end of the block + address: type: string - key: - properties: - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - tranche_key: - type: string - type: object - price_taker_to_maker: + order_type: + default: GOOD_TIL_CANCELLED + enum: + - GOOD_TIL_CANCELLED + - FILL_OR_KILL + - IMMEDIATE_OR_CANCEL + - JUST_IN_TIME + - GOOD_TIL_TIME type: string - reserves_maker_denom: + shares_cancelled: + title: 'TODO: remove this in next release. It is no longer used' type: string - reserves_taker_denom: + shares_owned: type: string - total_maker_denom: + shares_withdrawn: type: string - total_taker_denom: + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + tranche_key: type: string type: object type: array @@ -40698,74 +41871,118 @@ paths: message: type: string type: object - summary: Queries a list of InactiveLimitOrderTranche items. + summary: Queries a list of LimitOrderTranchUser items. tags: - Query - /neutron/dex/inactive_limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}: + /neutron/dex/limit_order_tranche_user/{address}/{tranche_key}: get: - operationId: InactiveLimitOrderTranche + operationId: LimitOrderTrancheUser parameters: - in: path - name: pair_id - required: true - type: string - - in: path - name: token_in - required: true - type: string - - format: int64 - in: path - name: tick_index + name: address required: true type: string - in: path name: tranche_key required: true type: string + - in: query + name: calc_withdrawable_shares + required: false + type: boolean responses: '200': description: A successful response. schema: properties: - inactive_limit_order_tranche: + limit_order_tranche_user: properties: - expiration_time: - format: date-time - title: >- - JIT orders also use expiration_time to handle deletion but - represent a special case - - All JIT orders have a expiration_time of 0 and an - exception is made to still treat these orders as live - - Order deletion still functions the same and the orders - will be deleted at the end of the block + address: type: string - key: + order_type: + default: GOOD_TIL_CANCELLED + enum: + - GOOD_TIL_CANCELLED + - FILL_OR_KILL + - IMMEDIATE_OR_CANCEL + - JUST_IN_TIME + - GOOD_TIL_TIME + type: string + shares_cancelled: + title: 'TODO: remove this in next release. It is no longer used' + type: string + shares_owned: + type: string + shares_withdrawn: + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: properties: - tick_index_taker_to_maker: - format: int64 + maker_denom: type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - tranche_key: + taker_denom: type: string type: object - price_taker_to_maker: - type: string - reserves_maker_denom: - type: string - reserves_taker_denom: + tranche_key: type: string - total_maker_denom: + type: object + withdrawable_shares: + type: string + type: object + default: + description: An unexpected error response. + schema: + properties: + code: + format: int32 + type: integer + details: + items: + properties: + type_url: + type: string + value: + format: byte + type: string + type: object + type: array + error: + type: string + message: + type: string + type: object + summary: Queries a LimitOrderTrancheUser by index. + tags: + - Query + /neutron/dex/params: + get: + operationId: Params + responses: + '200': + description: A successful response. + schema: + description: >- + QueryParamsResponse is response type for the Query/Params RPC + method. + properties: + params: + description: params holds all the parameters of this module. + properties: + fee_tiers: + items: + format: uint64 + type: string + type: array + good_til_purge_allowance: + format: uint64 type: string - total_taker_denom: + max_jits_per_block: + format: uint64 type: string + paused: + type: boolean type: object type: object default: @@ -40790,151 +42007,87 @@ paths: message: type: string type: object - summary: Queries a InactiveLimitOrderTranche by index. + summary: Parameters queries the parameters of the module. tags: - Query - /neutron/dex/limit_order_tranche/{pair_id}/{token_in}: + /neutron/dex/pool/{pair_id}/{tick_index}/{fee}: get: - operationId: LimitOrderTrancheAll + operationId: Pool parameters: - in: path name: pair_id required: true type: string - - in: path - name: token_in + - format: int64 + in: path + name: tick_index required: true type: string - - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - format: byte - in: query - name: pagination.key - required: false - type: string - - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - format: uint64 - in: query - name: pagination.offset - required: false - type: string - - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - format: uint64 - in: query - name: pagination.limit - required: false + - format: uint64 + in: path + name: fee + required: true type: string - - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. - in: query - name: pagination.count_total - required: false - type: boolean - - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - name: pagination.reverse - required: false - type: boolean responses: '200': description: A successful response. schema: properties: - limit_order_tranche: - items: - properties: - expiration_time: - format: date-time - title: >- - JIT orders also use expiration_time to handle deletion - but represent a special case - - All JIT orders have a expiration_time of 0 and an - exception is made to still treat these orders as live - - Order deletion still functions the same and the orders - will be deleted at the end of the block - type: string - key: - properties: - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - tranche_key: - type: string - type: object - price_taker_to_maker: - type: string - reserves_maker_denom: - type: string - reserves_taker_denom: - type: string - total_maker_denom: - type: string - total_taker_denom: - type: string - type: object - type: array - pagination: - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. - - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } + pool: properties: - next_key: - description: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently. It will be empty if - there are no more results. - format: byte - type: string - total: + id: format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise type: string + lower_tick0: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + upper_tick1: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object type: object type: object default: @@ -40959,76 +42112,78 @@ paths: message: type: string type: object - summary: |- - Queries a list of LimitOrderTranche items for a given pairID / TokenIn - combination. + summary: Queries a pool by pair, tick and fee tags: - Query - /neutron/dex/limit_order_tranche/{pair_id}/{token_in}/{tick_index}/{tranche_key}: + /neutron/dex/pool/{pool_id}: get: - operationId: LimitOrderTranche + operationId: PoolByID parameters: - - in: path - name: pair_id - required: true - type: string - - in: path - name: token_in - required: true - type: string - - format: int64 + - format: uint64 in: path - name: tick_index - required: true - type: string - - in: path - name: tranche_key + name: pool_id required: true type: string responses: '200': description: A successful response. - schema: - properties: - limit_order_tranche: - properties: - expiration_time: - format: date-time - title: >- - JIT orders also use expiration_time to handle deletion but - represent a special case - - All JIT orders have a expiration_time of 0 and an - exception is made to still treat these orders as live - - Order deletion still functions the same and the orders - will be deleted at the end of the block + schema: + properties: + pool: + properties: + id: + format: uint64 type: string - key: + lower_tick0: properties: - tick_index_taker_to_maker: - format: int64 + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: type: string - trade_pair_id: + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + upper_tick1: + properties: + key: properties: - maker_denom: + fee: + format: uint64 type: string - taker_denom: + tick_index_taker_to_maker: + format: int64 type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object type: object - tranche_key: + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: type: string type: object - price_taker_to_maker: - type: string - reserves_maker_denom: - type: string - reserves_taker_denom: - type: string - total_maker_denom: - type: string - total_taker_denom: - type: string type: object type: object default: @@ -41053,67 +42208,36 @@ paths: message: type: string type: object - summary: Queries a LimitOrderTranche by index. + summary: Queries a pool by ID tags: - Query - /neutron/dex/limit_order_tranche_user: + /neutron/dex/pool_metadata: get: - operationId: LimitOrderTrancheUserAll + operationId: SimulateMultiHopSwap parameters: - - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - format: byte - in: query - name: pagination.key + - in: query + name: msg.creator required: false type: string - - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - format: uint64 - in: query - name: pagination.offset + - in: query + name: msg.receiver required: false type: string - - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - format: uint64 - in: query - name: pagination.limit + - in: query + name: msg.amount_in required: false type: string - - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. - in: query - name: pagination.count_total + - in: query + name: msg.exit_limit_price required: false - type: boolean + type: string - description: >- - reverse is set to true if results are to be returned in the - descending order. - + If pickBestRoute == true then all routes are run and the route with + the - Since: cosmos-sdk 0.43 + best price is chosen otherwise, the first succesful route is used. in: query - name: pagination.reverse + name: msg.pick_best_route required: false type: boolean responses: @@ -41121,68 +42245,47 @@ paths: description: A successful response. schema: properties: - limit_order_tranche_user: - items: - properties: - address: - type: string - order_type: - default: GOOD_TIL_CANCELLED - enum: - - GOOD_TIL_CANCELLED - - FILL_OR_KILL - - IMMEDIATE_OR_CANCEL - - JUST_IN_TIME - - GOOD_TIL_TIME - type: string - shares_cancelled: - title: 'TODO: remove this in next release. It is no longer used' - type: string - shares_owned: - type: string - shares_withdrawn: - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: + resp: + properties: + coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + dust: + items: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. properties: - maker_denom: + amount: type: string - taker_denom: + denom: type: string type: object - tranche_key: - type: string - type: object - type: array - pagination: - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. - - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - properties: - next_key: - description: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently. It will be empty if - there are no more results. - format: byte - type: string - total: - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - type: string + type: array + route: + properties: + hops: + items: + type: string + type: array + type: object type: object type: object default: @@ -41207,65 +42310,42 @@ paths: message: type: string type: object - summary: Queries a list of LimitOrderTranchUser items. + summary: Simulates MsgMultiHopSwap tags: - Query - /neutron/dex/limit_order_tranche_user/{address}/{tranche_key}: + /neutron/dex/pool_metadata/{id}: get: - operationId: LimitOrderTrancheUser + operationId: PoolMetadata parameters: - - in: path - name: address - required: true - type: string - - in: path - name: tranche_key + - format: uint64 + in: path + name: id required: true type: string - - in: query - name: calc_withdrawable_shares - required: false - type: boolean responses: '200': description: A successful response. schema: properties: - limit_order_tranche_user: + Pool_metadata: properties: - address: - type: string - order_type: - default: GOOD_TIL_CANCELLED - enum: - - GOOD_TIL_CANCELLED - - FILL_OR_KILL - - IMMEDIATE_OR_CANCEL - - JUST_IN_TIME - - GOOD_TIL_TIME - type: string - shares_cancelled: - title: 'TODO: remove this in next release. It is no longer used' - type: string - shares_owned: - type: string - shares_withdrawn: + fee: + format: uint64 type: string - tick_index_taker_to_maker: - format: int64 + id: + format: uint64 type: string - trade_pair_id: + pair_id: properties: - maker_denom: + token0: type: string - taker_denom: + token1: type: string type: object - tranche_key: + tick: + format: int64 type: string type: object - withdrawable_shares: - type: string type: object default: description: An unexpected error response. @@ -41289,37 +42369,137 @@ paths: message: type: string type: object - summary: Queries a LimitOrderTrancheUser by index. + summary: Queries a PoolMetadata by ID tags: - Query - /neutron/dex/params: + /neutron/dex/pool_reserves/{pair_id}/{token_in}: get: - operationId: Params + operationId: PoolReservesAll + parameters: + - in: path + name: pair_id + required: true + type: string + - in: path + name: token_in + required: true + type: string + - description: |- + key is a value returned in PageResponse.next_key to begin + querying the next page most efficiently. Only one of offset or key + should be set. + format: byte + in: query + name: pagination.key + required: false + type: string + - description: >- + offset is a numeric offset that can be used when key is unavailable. + + It is less efficient than using key. Only one of offset or key + should + + be set. + format: uint64 + in: query + name: pagination.offset + required: false + type: string + - description: >- + limit is the total number of results to be returned in the result + page. + + If left empty it will default to a value to be set by each app. + format: uint64 + in: query + name: pagination.limit + required: false + type: string + - description: >- + count_total is set to true to indicate that the result set should + include + + a count of the total number of items available for pagination in + UIs. + + count_total is only respected when offset is used. It is ignored + when key + + is set. + in: query + name: pagination.count_total + required: false + type: boolean + - description: >- + reverse is set to true if results are to be returned in the + descending order. + + + Since: cosmos-sdk 0.43 + in: query + name: pagination.reverse + required: false + type: boolean responses: '200': description: A successful response. schema: - description: >- - QueryParamsResponse is response type for the Query/Params RPC - method. properties: - params: - description: params holds all the parameters of this module. + pagination: + description: >- + PageResponse is to be embedded in gRPC response messages where + the + + corresponding request message has used PageRequest. + + message SomeResponse { + repeated Bar results = 1; + PageResponse page = 2; + } properties: - fee_tiers: - items: - format: uint64 - type: string - type: array - good_til_purge_allowance: - format: uint64 + next_key: + description: |- + next_key is the key to be passed to PageRequest.key to + query the next page most efficiently. It will be empty if + there are no more results. + format: byte type: string - max_jits_per_block: + total: format: uint64 + title: >- + total is total number of results available if + PageRequest.count_total + + was set, its value is undefined otherwise type: string - paused: - type: boolean type: object + pool_reserves: + items: + properties: + key: + properties: + fee: + format: uint64 + type: string + tick_index_taker_to_maker: + format: int64 + type: string + trade_pair_id: + properties: + maker_denom: + type: string + taker_denom: + type: string + type: object + type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string + type: object + type: array type: object default: description: An unexpected error response. @@ -41343,17 +42523,21 @@ paths: message: type: string type: object - summary: Parameters queries the parameters of the module. + summary: Queries a list of PoolReserves items. tags: - Query - /neutron/dex/pool/{pair_id}/{tick_index}/{fee}: + /neutron/dex/pool_reserves/{pair_id}/{token_in}/{tick_index}/{fee}: get: - operationId: Pool + operationId: PoolReserves parameters: - in: path name: pair_id required: true type: string + - in: path + name: token_in + required: true + type: string - format: int64 in: path name: tick_index @@ -41369,61 +42553,30 @@ paths: description: A successful response. schema: properties: - pool: + pool_reserves: properties: - id: - format: uint64 - type: string - lower_tick0: + key: properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + fee: + format: uint64 type: string - reserves_maker_denom: + tick_index_taker_to_maker: + format: int64 type: string - type: object - upper_tick1: - properties: - key: + trade_pair_id: properties: - fee: - format: uint64 + maker_denom: type: string - tick_index_taker_to_maker: - format: int64 + taker_denom: type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: - type: string - reserves_maker_denom: - type: string type: object + price_opposite_taker_to_maker: + type: string + price_taker_to_maker: + type: string + reserves_maker_denom: + type: string type: object type: object default: @@ -41448,78 +42601,60 @@ paths: message: type: string type: object - summary: Queries a pool by pair, tick and fee + summary: Queries a PoolReserve by index tags: - Query - /neutron/dex/pool/{pool_id}: + /neutron/dex/simulate_cancel_limit_order: get: - operationId: PoolByID + operationId: SimulateCancelLimitOrder parameters: - - format: uint64 - in: path - name: pool_id - required: true + - in: query + name: msg.creator + required: false + type: string + - in: query + name: msg.tranche_key + required: false type: string responses: '200': description: A successful response. schema: properties: - pool: + resp: properties: - id: - format: uint64 - type: string - lower_tick0: - properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + maker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: type: string - reserves_maker_denom: + denom: type: string type: object - upper_tick1: + title: Total amount of maker reserves that were canceled + taker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + amount: type: string - reserves_maker_denom: + denom: type: string type: object + title: Total amount of taker reserves that were withdrawn type: object type: object default: @@ -41544,123 +42679,102 @@ paths: message: type: string type: object - summary: Queries a pool by ID + summary: Simulates MsgCancelLimitOrder tags: - Query - /neutron/dex/pool_metadata: + /neutron/dex/simulate_deposit: get: - operationId: PoolMetadataAll + operationId: SimulateDeposit parameters: - - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - format: byte - in: query - name: pagination.key + - in: query + name: msg.creator required: false type: string - - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - format: uint64 - in: query - name: pagination.offset + - in: query + name: msg.receiver required: false type: string - - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - format: uint64 - in: query - name: pagination.limit + - in: query + name: msg.token_a required: false type: string - - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. + - in: query + name: msg.token_b + required: false + type: string + - collectionFormat: multi in: query - name: pagination.count_total + items: + type: string + name: msg.amounts_a required: false - type: boolean - - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 + type: array + - collectionFormat: multi in: query - name: pagination.reverse + items: + type: string + name: msg.amounts_b required: false - type: boolean + type: array + - collectionFormat: multi + in: query + items: + format: int64 + type: string + name: msg.tick_indexes_a_to_b + required: false + type: array + - collectionFormat: multi + in: query + items: + format: uint64 + type: string + name: msg.fees + required: false + type: array responses: '200': description: A successful response. schema: properties: - pagination: - description: >- - PageResponse is to be embedded in gRPC response messages where - the - - corresponding request message has used PageRequest. - - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } + resp: properties: - next_key: - description: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently. It will be empty if - there are no more results. - format: byte - type: string - total: - format: uint64 - title: >- - total is total number of results available if - PageRequest.count_total - - was set, its value is undefined otherwise - type: string - type: object - pool_metadata: - items: - properties: - fee: - format: uint64 + failed_deposits: + items: + properties: + deposit_idx: + format: uint64 + type: string + error: + type: string + type: object + type: array + reserve0_deposited: + items: type: string - id: - format: uint64 + type: array + reserve1_deposited: + items: type: string - pair_id: + type: array + shares_issued: + items: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. properties: - token0: + amount: type: string - token1: + denom: type: string type: object - tick: - format: int64 - type: string - type: object - type: array + type: array + type: object type: object default: description: An unexpected error response. @@ -41684,40 +42798,134 @@ paths: message: type: string type: object - summary: Queries a list of PoolMetadata items. + summary: Simulates MsgDeposit tags: - Query - /neutron/dex/pool_metadata/{id}: + /neutron/dex/simulate_place_limit_order: get: - operationId: PoolMetadata + operationId: SimulatePlaceLimitOrder parameters: - - format: uint64 - in: path - name: id - required: true + - in: query + name: msg.creator + required: false + type: string + - in: query + name: msg.receiver + required: false + type: string + - in: query + name: msg.token_in + required: false + type: string + - in: query + name: msg.token_out + required: false + type: string + - description: >- + DEPRECATED: tick_index_in_to_out will be removed in future release; + limit_sell_price should be used instead. + format: int64 + in: query + name: msg.tick_index_in_to_out + required: false + type: string + - in: query + name: msg.amount_in + required: false + type: string + - default: GOOD_TIL_CANCELLED + enum: + - GOOD_TIL_CANCELLED + - FILL_OR_KILL + - IMMEDIATE_OR_CANCEL + - JUST_IN_TIME + - GOOD_TIL_TIME + in: query + name: msg.order_type + required: false + type: string + - description: expirationTime is only valid iff orderType == GOOD_TIL_TIME. + format: date-time + in: query + name: msg.expiration_time + required: false + type: string + - in: query + name: msg.max_amount_out + required: false + type: string + - in: query + name: msg.limit_sell_price + required: false type: string responses: '200': description: A successful response. schema: properties: - Pool_metadata: + resp: properties: - fee: - format: uint64 - type: string - id: - format: uint64 - type: string - pair_id: + coin_in: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of coin used for the limit order + taker_coin_in: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. properties: - token0: + amount: type: string - token1: + denom: type: string type: object - tick: - format: int64 + title: >- + Total amount of the token in that was immediately swapped + for takerOutCoin + taker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: >- + Total amount of coin received from the taker portion of + the limit order + + This is the amount of coin immediately available in the + users account after + + executing the limit order. It does not include any future + proceeds from the + + maker portion which will have withdrawn in the future + trancheKey: type: string type: object type: object @@ -41743,137 +42951,63 @@ paths: message: type: string type: object - summary: Queries a PoolMetadata by ID + summary: Simulates MsgPlaceLimitOrder tags: - Query - /neutron/dex/pool_reserves/{pair_id}/{token_in}: + /neutron/dex/simulate_withdraw_filled_limit_order: get: - operationId: PoolReservesAll + operationId: SimulateWithdrawFilledLimitOrder parameters: - - in: path - name: pair_id - required: true - type: string - - in: path - name: token_in - required: true - type: string - - description: |- - key is a value returned in PageResponse.next_key to begin - querying the next page most efficiently. Only one of offset or key - should be set. - format: byte - in: query - name: pagination.key - required: false - type: string - - description: >- - offset is a numeric offset that can be used when key is unavailable. - - It is less efficient than using key. Only one of offset or key - should - - be set. - format: uint64 - in: query - name: pagination.offset + - in: query + name: msg.creator required: false type: string - - description: >- - limit is the total number of results to be returned in the result - page. - - If left empty it will default to a value to be set by each app. - format: uint64 - in: query - name: pagination.limit + - in: query + name: msg.tranche_key required: false type: string - - description: >- - count_total is set to true to indicate that the result set should - include - - a count of the total number of items available for pagination in - UIs. - - count_total is only respected when offset is used. It is ignored - when key - - is set. - in: query - name: pagination.count_total - required: false - type: boolean - - description: >- - reverse is set to true if results are to be returned in the - descending order. - - - Since: cosmos-sdk 0.43 - in: query - name: pagination.reverse - required: false - type: boolean responses: '200': description: A successful response. schema: properties: - pagination: - description: >- - PageResponse is to be embedded in gRPC response messages where - the + resp: + properties: + maker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. - corresponding request message has used PageRequest. - message SomeResponse { - repeated Bar results = 1; - PageResponse page = 2; - } - properties: - next_key: - description: |- - next_key is the key to be passed to PageRequest.key to - query the next page most efficiently. It will be empty if - there are no more results. - format: byte - type: string - total: - format: uint64 + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object title: >- - total is total number of results available if - PageRequest.count_total + Total amount of maker reserves that were withdrawn --only + applies to inactive LimitOrders + taker_coin_out: + description: >- + Coin defines a token with a denomination and an amount. - was set, its value is undefined otherwise - type: string + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + title: Total amount of taker reserves that were withdrawn type: object - pool_reserves: - items: - properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: - type: string - reserves_maker_denom: - type: string - type: object - type: array type: object default: description: An unexpected error response. @@ -41897,60 +43031,80 @@ paths: message: type: string type: object - summary: Queries a list of PoolReserves items. + summary: Simulates MsgWithdrawFilledLimitOrder tags: - Query - /neutron/dex/pool_reserves/{pair_id}/{token_in}/{tick_index}/{fee}: + /neutron/dex/simulate_withdrawal: get: - operationId: PoolReserves + operationId: SimulateWithdrawal parameters: - - in: path - name: pair_id - required: true + - in: query + name: msg.creator + required: false type: string - - in: path - name: token_in - required: true + - in: query + name: msg.receiver + required: false type: string - - format: int64 - in: path - name: tick_index - required: true + - in: query + name: msg.token_a + required: false type: string - - format: uint64 - in: path - name: fee - required: true + - in: query + name: msg.token_b + required: false type: string + - collectionFormat: multi + in: query + items: + type: string + name: msg.shares_to_remove + required: false + type: array + - collectionFormat: multi + in: query + items: + format: int64 + type: string + name: msg.tick_indexes_a_to_b + required: false + type: array + - collectionFormat: multi + in: query + items: + format: uint64 + type: string + name: msg.fees + required: false + type: array responses: '200': description: A successful response. schema: properties: - pool_reserves: + resp: properties: - key: - properties: - fee: - format: uint64 - type: string - tick_index_taker_to_maker: - format: int64 - type: string - trade_pair_id: - properties: - maker_denom: - type: string - taker_denom: - type: string - type: object - type: object - price_opposite_taker_to_maker: - type: string - price_taker_to_maker: + reserve0_withdrawn: type: string - reserves_maker_denom: + reserve1_withdrawn: type: string + shares_burned: + items: + description: >- + Coin defines a token with a denomination and an amount. + + + NOTE: The amount field is an Int which implements the + custom method + + signatures required by gogoproto. + properties: + amount: + type: string + denom: + type: string + type: object + type: array type: object type: object default: @@ -41975,7 +43129,7 @@ paths: message: type: string type: object - summary: Queries a PoolReserve by index + summary: Simulates MsgWithdrawal tags: - Query /neutron/dex/tick_liquidity/{pair_id}/{token_in}: @@ -42739,6 +43893,16 @@ paths: params: description: params holds all the parameters of this module. properties: + max_kv_query_keys_count: + format: uint64 + title: Maximum amount of keys in a registered key value query + type: string + max_transactions_filters: + format: uint64 + title: >- + max_transactions_filters defines maximum allowed amount of + tx filters in msgRegisterInterchainQuery + type: string query_deposit: description: Amount of coins deposited for the query. items: diff --git a/go.mod b/go.mod index e8714d399..1f1ff6172 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/neutron-org/neutron/v4 +module github.com/neutron-org/neutron/v5 go 1.22.6 @@ -13,7 +13,7 @@ require ( cosmossdk.io/x/feegrant v0.1.1 cosmossdk.io/x/tx v0.13.5 cosmossdk.io/x/upgrade v0.1.4 - github.com/CosmWasm/wasmd v0.51.0 + github.com/CosmWasm/wasmd v0.53.0 github.com/CosmWasm/wasmvm/v2 v2.1.3 github.com/cometbft/cometbft v0.38.11 github.com/cosmos/admin-module/v2 v2.0.0-20240430142959-8b3328d1b1a2 @@ -46,8 +46,8 @@ require ( github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 - google.golang.org/grpc v1.67.0 - google.golang.org/protobuf v1.34.2 + google.golang.org/grpc v1.67.1 + google.golang.org/protobuf v1.35.1 gopkg.in/yaml.v2 v2.4.0 ) @@ -221,7 +221,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.53.0-neutron github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.2 - github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.8-neutron + github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53 // explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0 github.com/cosmos/interchain-security/v5 => github.com/cosmos/interchain-security/v5 v5.0.0-20240802125602-fa1e09444aae diff --git a/go.sum b/go.sum index c8c82dde1..b576a5f4b 100644 --- a/go.sum +++ b/go.sum @@ -847,8 +847,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neutron-org/admin-module/v2 v2.0.2 h1:XDDFWjvkVBKRf3lBFCazT1zAXZ3dHX8GaZ4ol8Hdk8I= github.com/neutron-org/admin-module/v2 v2.0.2/go.mod h1:RfOyabXsdJ5btcOKyKPZDYiZhtuKFubbJMOb8EJZtvA= -github.com/neutron-org/cosmos-sdk v0.50.8-neutron h1:L+4obYi/KkkmS05gBlXNF+FhipHYTl0iO3EkmpMBXkE= -github.com/neutron-org/cosmos-sdk v0.50.8-neutron/go.mod h1:Zb+DgHtiByNwgj71IlJBXwOq6dLhtyAq3AgqpXm/jHo= +github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53 h1:7FJOHOt9F0oea0b5jrn090u/zn7+LdBmT6ZDmrJtTqs= +github.com/neutron-org/cosmos-sdk v0.50.9-neutron.0.20240924163649-207f347e9c53/go.mod h1:TMH6wpoYBcg7Cp5BEg8fneLr+8XloNQkf2MRNF9V6JE= github.com/neutron-org/wasmd v0.53.0-neutron h1:Dv1VP1+QjYeb6RMo03sxw0Pe42JU0MPxefwNaG22KVs= github.com/neutron-org/wasmd v0.53.0-neutron/go.mod h1:FJl/aWjdpGof3usAMFQpDe07Rkx77PUzp0cygFMOvtw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -1676,8 +1676,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw= -google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= +google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E= +google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1694,8 +1694,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/proto/gaia/globalfee/v1beta1/genesis.proto b/proto/gaia/globalfee/v1beta1/genesis.proto index 269b15413..e2ed073be 100644 --- a/proto/gaia/globalfee/v1beta1/genesis.proto +++ b/proto/gaia/globalfee/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package gaia.globalfee.v1beta1; import "gaia/globalfee/v1beta1/params.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/globalfee/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/globalfee/types"; // GenesisState - initial state of module message GenesisState { diff --git a/proto/gaia/globalfee/v1beta1/params.proto b/proto/gaia/globalfee/v1beta1/params.proto index bced7cd69..473f84ae5 100644 --- a/proto/gaia/globalfee/v1beta1/params.proto +++ b/proto/gaia/globalfee/v1beta1/params.proto @@ -4,7 +4,7 @@ package gaia.globalfee.v1beta1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/globalfee/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/globalfee/types"; // Params defines the set of module parameters. message Params { diff --git a/proto/gaia/globalfee/v1beta1/query.proto b/proto/gaia/globalfee/v1beta1/query.proto index ea8879f61..05e3de0e0 100644 --- a/proto/gaia/globalfee/v1beta1/query.proto +++ b/proto/gaia/globalfee/v1beta1/query.proto @@ -5,7 +5,7 @@ import "gaia/globalfee/v1beta1/params.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/globalfee/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/globalfee/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/gaia/globalfee/v1beta1/tx.proto b/proto/gaia/globalfee/v1beta1/tx.proto index ffbdc0d8a..e5410bf35 100644 --- a/proto/gaia/globalfee/v1beta1/tx.proto +++ b/proto/gaia/globalfee/v1beta1/tx.proto @@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto"; import "gaia/globalfee/v1beta1/params.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/globalfee/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/globalfee/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/contractmanager/failure.proto b/proto/neutron/contractmanager/failure.proto index 87e73b148..4ba42d797 100644 --- a/proto/neutron/contractmanager/failure.proto +++ b/proto/neutron/contractmanager/failure.proto @@ -3,7 +3,7 @@ package neutron.contractmanager; import "ibc/core/channel/v1/channel.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/contractmanager/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/contractmanager/types"; // Failure message contains information about ACK failures and can be used to // replay ACK in case of requirement. diff --git a/proto/neutron/contractmanager/genesis.proto b/proto/neutron/contractmanager/genesis.proto index 74728c4a7..564e35a3a 100644 --- a/proto/neutron/contractmanager/genesis.proto +++ b/proto/neutron/contractmanager/genesis.proto @@ -6,7 +6,7 @@ import "neutron/contractmanager/failure.proto"; import "neutron/contractmanager/params.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/neutron-org/neutron/v4/x/contractmanager/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/contractmanager/types"; // GenesisState defines the contractmanager module's genesis state. message GenesisState { diff --git a/proto/neutron/contractmanager/params.proto b/proto/neutron/contractmanager/params.proto index 3eb687a7e..309798cbf 100644 --- a/proto/neutron/contractmanager/params.proto +++ b/proto/neutron/contractmanager/params.proto @@ -3,7 +3,7 @@ package neutron.contractmanager; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/contractmanager/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/contractmanager/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/contractmanager/query.proto b/proto/neutron/contractmanager/query.proto index 32280f2ae..abda10bf6 100644 --- a/proto/neutron/contractmanager/query.proto +++ b/proto/neutron/contractmanager/query.proto @@ -8,7 +8,7 @@ import "neutron/contractmanager/failure.proto"; import "neutron/contractmanager/params.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/neutron-org/neutron/v4/x/contractmanager/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/contractmanager/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/neutron/contractmanager/tx.proto b/proto/neutron/contractmanager/tx.proto index cf91f125c..24a98596d 100644 --- a/proto/neutron/contractmanager/tx.proto +++ b/proto/neutron/contractmanager/tx.proto @@ -9,7 +9,7 @@ import "neutron/contractmanager/params.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/neutron-org/neutron/v4/x/contractmanager/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/contractmanager/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/contractmanager/v1/failure.proto b/proto/neutron/contractmanager/v1/failure.proto index 595ec7993..36b86bac2 100644 --- a/proto/neutron/contractmanager/v1/failure.proto +++ b/proto/neutron/contractmanager/v1/failure.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package neutron.contractmanager.v1; -option go_package = "github.com/neutron-org/neutron/v4/x/contractmanager/types/v1"; +option go_package = "github.com/neutron-org/neutron/v5/x/contractmanager/types/v1"; // Deprecated. Used only for migration purposes. message Failure { diff --git a/proto/neutron/cron/genesis.proto b/proto/neutron/cron/genesis.proto index eba407f97..9a570c257 100644 --- a/proto/neutron/cron/genesis.proto +++ b/proto/neutron/cron/genesis.proto @@ -6,7 +6,7 @@ import "neutron/cron/params.proto"; import "neutron/cron/schedule.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/neutron-org/neutron/v4/x/cron/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/cron/types"; // Defines the cron module's genesis state. message GenesisState { diff --git a/proto/neutron/cron/params.proto b/proto/neutron/cron/params.proto index c3c5cf452..0018d73ed 100644 --- a/proto/neutron/cron/params.proto +++ b/proto/neutron/cron/params.proto @@ -3,7 +3,7 @@ package neutron.cron; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/cron/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/cron/types"; // Defines the parameters for the module. message Params { diff --git a/proto/neutron/cron/query.proto b/proto/neutron/cron/query.proto index 60ee505e0..c75045c1e 100644 --- a/proto/neutron/cron/query.proto +++ b/proto/neutron/cron/query.proto @@ -8,7 +8,7 @@ import "neutron/cron/params.proto"; import "neutron/cron/schedule.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/neutron-org/neutron/v4/x/cron/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/cron/types"; // Defines the gRPC querier service. service Query { diff --git a/proto/neutron/cron/schedule.proto b/proto/neutron/cron/schedule.proto index b6147aed4..7cfa2caa6 100644 --- a/proto/neutron/cron/schedule.proto +++ b/proto/neutron/cron/schedule.proto @@ -3,7 +3,7 @@ package neutron.cron; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/cron/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/cron/types"; // Defines when messages will be executed in the block enum ExecutionStage { diff --git a/proto/neutron/cron/tx.proto b/proto/neutron/cron/tx.proto index fcb9b383a..be869cdd8 100644 --- a/proto/neutron/cron/tx.proto +++ b/proto/neutron/cron/tx.proto @@ -10,7 +10,7 @@ import "neutron/cron/schedule.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/neutron-org/neutron/v4/x/cron/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/cron/types"; // Defines the Msg service. service Msg { diff --git a/proto/neutron/cron/v1/schedule.proto b/proto/neutron/cron/v1/schedule.proto index 8995431fe..3593f5058 100644 --- a/proto/neutron/cron/v1/schedule.proto +++ b/proto/neutron/cron/v1/schedule.proto @@ -3,7 +3,7 @@ package neutron.cron.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/cron/types/v1"; +option go_package = "github.com/neutron-org/neutron/v5/x/cron/types/v1"; // Defines the schedule for execution message Schedule { diff --git a/proto/neutron/dex/deposit_record.proto b/proto/neutron/dex/deposit_record.proto index 65227075c..e97ce4bf3 100644 --- a/proto/neutron/dex/deposit_record.proto +++ b/proto/neutron/dex/deposit_record.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "neutron/dex/pair_id.proto"; import "neutron/dex/pool.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message DepositRecord { PairID pair_id = 1; diff --git a/proto/neutron/dex/genesis.proto b/proto/neutron/dex/genesis.proto index 9630fdc02..97e70d559 100644 --- a/proto/neutron/dex/genesis.proto +++ b/proto/neutron/dex/genesis.proto @@ -11,7 +11,7 @@ import "neutron/dex/tick_liquidity.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; // GenesisState defines the dex module's genesis state. message GenesisState { diff --git a/proto/neutron/dex/limit_order_expiration.proto b/proto/neutron/dex/limit_order_expiration.proto index c678e21cc..e8ceb702f 100644 --- a/proto/neutron/dex/limit_order_expiration.proto +++ b/proto/neutron/dex/limit_order_expiration.proto @@ -4,7 +4,7 @@ package neutron.dex; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message LimitOrderExpiration { // see limitOrderTranche.proto for details on expiration_time diff --git a/proto/neutron/dex/limit_order_tranche.proto b/proto/neutron/dex/limit_order_tranche.proto index 9d05dcd96..2f54beec0 100644 --- a/proto/neutron/dex/limit_order_tranche.proto +++ b/proto/neutron/dex/limit_order_tranche.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "neutron/dex/pair_id.proto"; import "neutron/dex/trade_pair_id.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message LimitOrderTrancheKey { TradePairID trade_pair_id = 1; @@ -51,7 +51,7 @@ message LimitOrderTranche { ]; string price_taker_to_maker = 7 [ (gogoproto.moretags) = "yaml:\"price_taker_to_maker\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "price_taker_to_maker" ]; diff --git a/proto/neutron/dex/limit_order_tranche_user.proto b/proto/neutron/dex/limit_order_tranche_user.proto index 89cd817b6..64b6e5a8b 100644 --- a/proto/neutron/dex/limit_order_tranche_user.proto +++ b/proto/neutron/dex/limit_order_tranche_user.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "neutron/dex/trade_pair_id.proto"; import "neutron/dex/tx.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message LimitOrderTrancheUser { TradePairID trade_pair_id = 1; diff --git a/proto/neutron/dex/pair_id.proto b/proto/neutron/dex/pair_id.proto index f32ba2f49..92ab73532 100644 --- a/proto/neutron/dex/pair_id.proto +++ b/proto/neutron/dex/pair_id.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package neutron.dex; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message PairID { string token0 = 1; diff --git a/proto/neutron/dex/params.proto b/proto/neutron/dex/params.proto index 43c20db29..a25c48d61 100644 --- a/proto/neutron/dex/params.proto +++ b/proto/neutron/dex/params.proto @@ -3,7 +3,7 @@ package neutron.dex; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/dex/pool.proto b/proto/neutron/dex/pool.proto index 825182482..231a1df4b 100644 --- a/proto/neutron/dex/pool.proto +++ b/proto/neutron/dex/pool.proto @@ -4,7 +4,7 @@ package neutron.dex; import "gogoproto/gogo.proto"; import "neutron/dex/pool_reserves.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; // NOTE: This struct is never actually stored in the KV store. It is merely a // convenience wrapper for holding both sides of a pool. diff --git a/proto/neutron/dex/pool_metadata.proto b/proto/neutron/dex/pool_metadata.proto index b1b32da97..d84ada0c5 100644 --- a/proto/neutron/dex/pool_metadata.proto +++ b/proto/neutron/dex/pool_metadata.proto @@ -3,7 +3,7 @@ package neutron.dex; import "neutron/dex/pair_id.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message PoolMetadata { uint64 id = 1; diff --git a/proto/neutron/dex/pool_reserves.proto b/proto/neutron/dex/pool_reserves.proto index c633a551a..998b2d0cb 100644 --- a/proto/neutron/dex/pool_reserves.proto +++ b/proto/neutron/dex/pool_reserves.proto @@ -4,7 +4,7 @@ package neutron.dex; import "gogoproto/gogo.proto"; import "neutron/dex/trade_pair_id.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message PoolReservesKey { TradePairID trade_pair_id = 1; @@ -22,13 +22,13 @@ message PoolReserves { ]; string price_taker_to_maker = 3 [ (gogoproto.moretags) = "yaml:\"price_taker_to_maker\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "price_taker_to_maker" ]; string price_opposite_taker_to_maker = 4 [ (gogoproto.moretags) = "yaml:\"price_opposite_taker_to_maker\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "price_opposite_taker_to_maker" ]; diff --git a/proto/neutron/dex/query.proto b/proto/neutron/dex/query.proto index ef524da0c..0eafcd528 100644 --- a/proto/neutron/dex/query.proto +++ b/proto/neutron/dex/query.proto @@ -19,7 +19,7 @@ import "neutron/dex/tx.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; // Query defines the gRPC querier service. service Query { @@ -96,14 +96,16 @@ service Query { option (google.api.http).get = "/neutron/dex/pool_reserves/{pair_id}/{token_in}/{tick_index}/{fee}"; } - // Queries the simulated result of a multihop swap + // DEPRECATED Queries the simulated result of a multihop swap rpc EstimateMultiHopSwap(QueryEstimateMultiHopSwapRequest) returns (QueryEstimateMultiHopSwapResponse) { option (google.api.http).get = "/neutron/dex/estimate_multi_hop_swap"; + option deprecated = true; } - // Queries the simulated result of a PlaceLimit order + // DEPRECATED Queries the simulated result of a PlaceLimit order rpc EstimatePlaceLimitOrder(QueryEstimatePlaceLimitOrderRequest) returns (QueryEstimatePlaceLimitOrderResponse) { option (google.api.http).get = "/neutron/dex/estimate_place_limit_order"; + option deprecated = true; } // Queries a pool by pair, tick and fee @@ -126,6 +128,36 @@ service Query { option (google.api.http).get = "/neutron/dex/pool_metadata"; } + // Simulates MsgDeposit + rpc SimulateDeposit(QuerySimulateDepositRequest) returns (QuerySimulateDepositResponse) { + option (google.api.http).get = "/neutron/dex/simulate_deposit"; + } + + // Simulates MsgWithdrawal + rpc SimulateWithdrawal(QuerySimulateWithdrawalRequest) returns (QuerySimulateWithdrawalResponse) { + option (google.api.http).get = "/neutron/dex/simulate_withdrawal"; + } + + // Simulates MsgPlaceLimitOrder + rpc SimulatePlaceLimitOrder(QuerySimulatePlaceLimitOrderRequest) returns (QuerySimulatePlaceLimitOrderResponse) { + option (google.api.http).get = "/neutron/dex/simulate_place_limit_order"; + } + + // Simulates MsgWithdrawFilledLimitOrder + rpc SimulateWithdrawFilledLimitOrder(QuerySimulateWithdrawFilledLimitOrderRequest) returns (QuerySimulateWithdrawFilledLimitOrderResponse) { + option (google.api.http).get = "/neutron/dex/simulate_withdraw_filled_limit_order"; + } + + // Simulates MsgCancelLimitOrder + rpc SimulateCancelLimitOrder(QuerySimulateCancelLimitOrderRequest) returns (QuerySimulateCancelLimitOrderResponse) { + option (google.api.http).get = "/neutron/dex/simulate_cancel_limit_order"; + } + + // Simulates MsgMultiHopSwap + rpc SimulateMultiHopSwap(QuerySimulateMultiHopSwapRequest) returns (QuerySimulateMultiHopSwapResponse) { + option (google.api.http).get = "/neutron/dex/pool_metadata"; + } + // this line is used by starport scaffolding # 2 } @@ -260,6 +292,7 @@ message QueryGetPoolReservesResponse { } message QueryEstimateMultiHopSwapRequest { + // DEPRECATED: Use QuerySimulateMultiHopSwap string creator = 1; string receiver = 2; repeated MultiHopRoute routes = 3; @@ -271,7 +304,7 @@ message QueryEstimateMultiHopSwapRequest { ]; string exit_limit_price = 5 [ (gogoproto.moretags) = "yaml:\"exit_limit_price\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exit_limit_price" ]; @@ -290,6 +323,7 @@ message QueryEstimateMultiHopSwapResponse { } message QueryEstimatePlaceLimitOrderRequest { + // DEPRECATED: Use QuerySimulatePlaceLimitOrder string creator = 1; string receiver = 2; string token_in = 3; @@ -378,4 +412,52 @@ message QueryAllPoolMetadataResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } +message QuerySimulateDepositRequest { + MsgDeposit msg = 1; +} + +message QuerySimulateDepositResponse { + MsgDepositResponse resp = 1; +} + +message QuerySimulateWithdrawalRequest { + MsgWithdrawal msg = 1; +} + +message QuerySimulateWithdrawalResponse { + MsgWithdrawalResponse resp = 1; +} + +message QuerySimulatePlaceLimitOrderRequest { + MsgPlaceLimitOrder msg = 1; +} + +message QuerySimulatePlaceLimitOrderResponse { + MsgPlaceLimitOrderResponse resp = 1; +} + +message QuerySimulateWithdrawFilledLimitOrderRequest { + MsgWithdrawFilledLimitOrder msg = 1; +} + +message QuerySimulateWithdrawFilledLimitOrderResponse { + MsgWithdrawFilledLimitOrderResponse resp = 1; +} + +message QuerySimulateCancelLimitOrderRequest { + MsgCancelLimitOrder msg = 1; +} + +message QuerySimulateCancelLimitOrderResponse { + MsgCancelLimitOrderResponse resp = 1; +} + +message QuerySimulateMultiHopSwapRequest { + MsgMultiHopSwap msg = 1; +} + +message QuerySimulateMultiHopSwapResponse { + MsgMultiHopSwapResponse resp = 1; +} + // this line is used by starport scaffolding # 3 diff --git a/proto/neutron/dex/tick_liquidity.proto b/proto/neutron/dex/tick_liquidity.proto index 7d6609ca4..b6b40b73d 100644 --- a/proto/neutron/dex/tick_liquidity.proto +++ b/proto/neutron/dex/tick_liquidity.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "neutron/dex/limit_order_tranche.proto"; import "neutron/dex/pool_reserves.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message TickLiquidity { oneof liquidity { diff --git a/proto/neutron/dex/trade_pair_id.proto b/proto/neutron/dex/trade_pair_id.proto index c5c359e67..84f154fdb 100644 --- a/proto/neutron/dex/trade_pair_id.proto +++ b/proto/neutron/dex/trade_pair_id.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package neutron.dex; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; message TradePairID { string maker_denom = 2; diff --git a/proto/neutron/dex/tx.proto b/proto/neutron/dex/tx.proto index 093591440..c5a0f9eed 100644 --- a/proto/neutron/dex/tx.proto +++ b/proto/neutron/dex/tx.proto @@ -11,7 +11,7 @@ import "neutron/dex/params.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types"; // Msg defines the Msg service. service Msg { @@ -75,6 +75,12 @@ message MsgDepositResponse { (gogoproto.jsontag) = "reserve1_deposited" ]; repeated FailedDeposit failed_deposits = 3; + repeated cosmos.base.v1beta1.Coin shares_issued = 4 [ + (gogoproto.moretags) = "yaml:\"shares_issued\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "shares_issued" + ]; } message MsgWithdrawal { @@ -95,7 +101,26 @@ message MsgWithdrawal { repeated uint64 fees = 7; } -message MsgWithdrawalResponse {} +message MsgWithdrawalResponse { + string reserve0_withdrawn = 1 [ + (gogoproto.moretags) = "yaml:\"reserve0_withdrawn\"", + (gogoproto.customtype) = "cosmossdk.io/math.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "reserve0_withdrawn" + ]; + string reserve1_withdrawn = 2 [ + (gogoproto.moretags) = "yaml:\"reserve1_withdrawn\"", + (gogoproto.customtype) = "cosmossdk.io/math.Int", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "reserve1_withdrawn" + ]; + repeated cosmos.base.v1beta1.Coin shares_burned = 3 [ + (gogoproto.moretags) = "yaml:\"shares_burned\"", + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.nullable) = false, + (gogoproto.jsontag) = "shares_burned" + ]; +} enum LimitOrderType { GOOD_TIL_CANCELLED = 0; @@ -136,7 +161,7 @@ message MsgPlaceLimitOrder { ]; string limit_sell_price = 11 [ (gogoproto.moretags) = "yaml:\"limit_sell_price\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = true, (gogoproto.jsontag) = "limit_sell_price" ]; @@ -161,6 +186,14 @@ message MsgPlaceLimitOrderResponse { (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "taker_coin_out" ]; + + // Total amount of the token in that was immediately swapped for takerOutCoin + cosmos.base.v1beta1.Coin taker_coin_in = 4 [ + (gogoproto.moretags) = "yaml:\"taker_coin_in\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "taker_coin_in" + ]; } message MsgWithdrawFilledLimitOrder { @@ -171,7 +204,22 @@ message MsgWithdrawFilledLimitOrder { string tranche_key = 2; } -message MsgWithdrawFilledLimitOrderResponse {} +message MsgWithdrawFilledLimitOrderResponse { + // Total amount of taker reserves that were withdrawn + cosmos.base.v1beta1.Coin taker_coin_out = 1 [ + (gogoproto.moretags) = "yaml:\"taker_coin_out\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "taker_coin_out" + ]; + // Total amount of maker reserves that were withdrawn --only applies to inactive LimitOrders + cosmos.base.v1beta1.Coin maker_coin_out = 2 [ + (gogoproto.moretags) = "yaml:\"maker_coin_out\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "maker_coin_out" + ]; +} message MsgCancelLimitOrder { option (amino.name) = "dex/MsgCancelLimitOrder"; @@ -181,7 +229,22 @@ message MsgCancelLimitOrder { string tranche_key = 2; } -message MsgCancelLimitOrderResponse {} +message MsgCancelLimitOrderResponse { + // Total amount of taker reserves that were withdrawn + cosmos.base.v1beta1.Coin taker_coin_out = 1 [ + (gogoproto.moretags) = "yaml:\"taker_coin_out\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "taker_coin_out" + ]; + // Total amount of maker reserves that were canceled + cosmos.base.v1beta1.Coin maker_coin_out = 2 [ + (gogoproto.moretags) = "yaml:\"maker_coin_out\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "maker_coin_out" + ]; +} message MultiHopRoute { repeated string hops = 1; @@ -202,7 +265,7 @@ message MsgMultiHopSwap { ]; string exit_limit_price = 5 [ (gogoproto.moretags) = "yaml:\"exit_limit_price\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "exit_limit_price" ]; @@ -213,10 +276,18 @@ message MsgMultiHopSwap { message MsgMultiHopSwapResponse { cosmos.base.v1beta1.Coin coin_out = 1 [ + (gogoproto.moretags) = "yaml:\"coin_out\"", (gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", (gogoproto.jsontag) = "coin_out" ]; + MultiHopRoute route = 2; + repeated cosmos.base.v1beta1.Coin dust = 3 [ + (gogoproto.moretags) = "yaml:\"dust\"", + (gogoproto.nullable) = false, + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coin", + (gogoproto.jsontag) = "dust" + ]; } message MsgUpdateParams { diff --git a/proto/neutron/dex/v2/params.proto b/proto/neutron/dex/v2/params.proto index 64df63408..335763b2e 100644 --- a/proto/neutron/dex/v2/params.proto +++ b/proto/neutron/dex/v2/params.proto @@ -3,7 +3,7 @@ package neutron.dex.v2; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dex/types/v2"; +option go_package = "github.com/neutron-org/neutron/v5/x/dex/types/v2"; // Params defines the parameters for the module. message Params { @@ -11,7 +11,7 @@ message Params { repeated uint64 fee_tiers = 1; string max_true_taker_spread = 2 [ (gogoproto.moretags) = "yaml:\"max_true_taker_spread\"", - (gogoproto.customtype) = "github.com/neutron-org/neutron/v4/utils/math.PrecDec", + (gogoproto.customtype) = "github.com/neutron-org/neutron/v5/utils/math.PrecDec", (gogoproto.nullable) = false, (gogoproto.jsontag) = "max_true_taker_spread" ]; diff --git a/proto/neutron/dynamicfees/v1/genesis.proto b/proto/neutron/dynamicfees/v1/genesis.proto index dcdfe3d18..a889fb4f7 100644 --- a/proto/neutron/dynamicfees/v1/genesis.proto +++ b/proto/neutron/dynamicfees/v1/genesis.proto @@ -4,7 +4,7 @@ package neutron.dynamicfees.v1; import "gogoproto/gogo.proto"; import "neutron/dynamicfees/v1/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dynamicfees/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dynamicfees/types"; // GenesisState defines the dynamicfees module's genesis state. message GenesisState { diff --git a/proto/neutron/dynamicfees/v1/params.proto b/proto/neutron/dynamicfees/v1/params.proto index 1e87168e2..5cf191528 100644 --- a/proto/neutron/dynamicfees/v1/params.proto +++ b/proto/neutron/dynamicfees/v1/params.proto @@ -4,7 +4,7 @@ package neutron.dynamicfees.v1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dynamicfees/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dynamicfees/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/dynamicfees/v1/query.proto b/proto/neutron/dynamicfees/v1/query.proto index aa717bf96..88eab2391 100644 --- a/proto/neutron/dynamicfees/v1/query.proto +++ b/proto/neutron/dynamicfees/v1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "neutron/dynamicfees/v1/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dynamicfees/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dynamicfees/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/neutron/dynamicfees/v1/tx.proto b/proto/neutron/dynamicfees/v1/tx.proto index dd02203df..9653ca985 100644 --- a/proto/neutron/dynamicfees/v1/tx.proto +++ b/proto/neutron/dynamicfees/v1/tx.proto @@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "neutron/dynamicfees/v1/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/dynamicfees/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/dynamicfees/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/feeburner/genesis.proto b/proto/neutron/feeburner/genesis.proto index 70fb5034b..7d778259b 100644 --- a/proto/neutron/feeburner/genesis.proto +++ b/proto/neutron/feeburner/genesis.proto @@ -6,7 +6,7 @@ import "neutron/feeburner/params.proto"; import "neutron/feeburner/total_burned_neutrons_amount.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/neutron-org/neutron/v4/x/feeburner/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feeburner/types"; // GenesisState defines the feeburner module's genesis state. message GenesisState { diff --git a/proto/neutron/feeburner/params.proto b/proto/neutron/feeburner/params.proto index e940844d7..332faf399 100644 --- a/proto/neutron/feeburner/params.proto +++ b/proto/neutron/feeburner/params.proto @@ -3,7 +3,7 @@ package neutron.feeburner; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/feeburner/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feeburner/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/feeburner/query.proto b/proto/neutron/feeburner/query.proto index 3dfd880b7..c605a2c2f 100644 --- a/proto/neutron/feeburner/query.proto +++ b/proto/neutron/feeburner/query.proto @@ -8,7 +8,7 @@ import "neutron/feeburner/params.proto"; import "neutron/feeburner/total_burned_neutrons_amount.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/neutron-org/neutron/v4/x/feeburner/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feeburner/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/neutron/feeburner/total_burned_neutrons_amount.proto b/proto/neutron/feeburner/total_burned_neutrons_amount.proto index 30935366f..304b99600 100644 --- a/proto/neutron/feeburner/total_burned_neutrons_amount.proto +++ b/proto/neutron/feeburner/total_burned_neutrons_amount.proto @@ -4,7 +4,7 @@ package neutron.feeburner; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/feeburner/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feeburner/types"; // TotalBurnedNeutronsAmount defines total amount of burned neutron fees message TotalBurnedNeutronsAmount { diff --git a/proto/neutron/feeburner/tx.proto b/proto/neutron/feeburner/tx.proto index 94240af8c..d1eb6132c 100644 --- a/proto/neutron/feeburner/tx.proto +++ b/proto/neutron/feeburner/tx.proto @@ -9,7 +9,7 @@ import "neutron/feeburner/params.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/neutron-org/neutron/v4/x/feeburner/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feeburner/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/feerefunder/fee.proto b/proto/neutron/feerefunder/fee.proto index 07540a281..90017bc68 100644 --- a/proto/neutron/feerefunder/fee.proto +++ b/proto/neutron/feerefunder/fee.proto @@ -4,7 +4,7 @@ package neutron.feerefunder; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/feerefunder/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feerefunder/types"; // Fee defines the ICS29 receive, acknowledgement and timeout fees message Fee { diff --git a/proto/neutron/feerefunder/genesis.proto b/proto/neutron/feerefunder/genesis.proto index 022f11c2f..d409c245d 100644 --- a/proto/neutron/feerefunder/genesis.proto +++ b/proto/neutron/feerefunder/genesis.proto @@ -6,7 +6,7 @@ import "neutron/feerefunder/fee.proto"; import "neutron/feerefunder/params.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "github.com/neutron-org/neutron/v4/x/feerefunder/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feerefunder/types"; // GenesisState defines the fee module's genesis state. message GenesisState { diff --git a/proto/neutron/feerefunder/params.proto b/proto/neutron/feerefunder/params.proto index cdbd7d651..4c72177b5 100644 --- a/proto/neutron/feerefunder/params.proto +++ b/proto/neutron/feerefunder/params.proto @@ -4,7 +4,7 @@ package neutron.feerefunder; import "gogoproto/gogo.proto"; import "neutron/feerefunder/fee.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/feerefunder/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feerefunder/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/feerefunder/query.proto b/proto/neutron/feerefunder/query.proto index a032f100c..75329df1f 100644 --- a/proto/neutron/feerefunder/query.proto +++ b/proto/neutron/feerefunder/query.proto @@ -8,7 +8,7 @@ import "neutron/feerefunder/genesis.proto"; import "neutron/feerefunder/params.proto"; // this line is used by starport scaffolding # 1 -option go_package = "github.com/neutron-org/neutron/v4/x/feerefunder/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feerefunder/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/neutron/feerefunder/tx.proto b/proto/neutron/feerefunder/tx.proto index 325796af0..d90c23297 100644 --- a/proto/neutron/feerefunder/tx.proto +++ b/proto/neutron/feerefunder/tx.proto @@ -9,7 +9,7 @@ import "neutron/feerefunder/params.proto"; // this line is used by starport scaffolding # proto/tx/import -option go_package = "github.com/neutron-org/neutron/v4/x/feerefunder/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/feerefunder/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/ibcratelimit/v1beta1/genesis.proto b/proto/neutron/ibcratelimit/v1beta1/genesis.proto new file mode 100644 index 000000000..f66c0fcd4 --- /dev/null +++ b/proto/neutron/ibcratelimit/v1beta1/genesis.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package neutron.ibcratelimit.v1beta1; + +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; +import "google/protobuf/any.proto"; +import "neutron/ibcratelimit/v1beta1/params.proto"; + +option go_package = "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types"; + +// GenesisState defines the ibc-rate-limit module's genesis state. +message GenesisState { + // params are all the parameters of the module + Params params = 1 [(gogoproto.nullable) = false]; +} diff --git a/proto/neutron/ibcratelimit/v1beta1/params.proto b/proto/neutron/ibcratelimit/v1beta1/params.proto new file mode 100644 index 000000000..8dee35a10 --- /dev/null +++ b/proto/neutron/ibcratelimit/v1beta1/params.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package neutron.ibcratelimit.v1beta1; + +import "gogoproto/gogo.proto"; + +option go_package = "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types"; + +// Params defines the parameters for the ibc-rate-limit module. +message Params { + string contract_address = 1 [ + (gogoproto.moretags) = "yaml:\"contract_address\"", + (gogoproto.nullable) = true + ]; +} diff --git a/proto/neutron/ibcratelimit/v1beta1/query.proto b/proto/neutron/ibcratelimit/v1beta1/query.proto new file mode 100644 index 000000000..79b560ff3 --- /dev/null +++ b/proto/neutron/ibcratelimit/v1beta1/query.proto @@ -0,0 +1,27 @@ +syntax = "proto3"; +package neutron.ibcratelimit.v1beta1; + +import "cosmos/base/query/v1beta1/pagination.proto"; +import "gogoproto/gogo.proto"; +import "google/api/annotations.proto"; +import "neutron/ibcratelimit/v1beta1/params.proto"; + +option go_package = "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types"; + +// Query defines the gRPC querier service. +service Query { + // Params defines a gRPC query method that returns the ibc-rate-limit module's + // parameters. + rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { + option (google.api.http).get = "/neutron/ibc-rate-limit/v1beta1/params"; + } +} + +// ParamsRequest is the request type for the Query/Params RPC method. +message QueryParamsRequest {} + +// aramsResponse is the response type for the Query/Params RPC method. +message QueryParamsResponse { + // params defines the parameters of the module. + Params params = 1 [(gogoproto.nullable) = false]; +} diff --git a/proto/neutron/ibcratelimit/v1beta1/tx.proto b/proto/neutron/ibcratelimit/v1beta1/tx.proto new file mode 100644 index 000000000..71ff52e9c --- /dev/null +++ b/proto/neutron/ibcratelimit/v1beta1/tx.proto @@ -0,0 +1,43 @@ +syntax = "proto3"; +package neutron.ibcratelimit.v1beta1; + +import "amino/amino.proto"; +import "cosmos/bank/v1beta1/bank.proto"; +import "cosmos/base/v1beta1/coin.proto"; +import "cosmos/msg/v1/msg.proto"; +import "cosmos_proto/cosmos.proto"; +import "gogoproto/gogo.proto"; +import "neutron/ibcratelimit/v1beta1/params.proto"; + +option go_package = "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types"; + +// Msg defines the tokefactory module's gRPC message service. +service Msg { + option (cosmos.msg.v1.service) = true; + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); +} + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +message MsgUpdateParams { + option (amino.name) = "neutron/ibc-rate-limit/MsgUpdateParams"; + option (cosmos.msg.v1.signer) = "authority"; + + // Authority is the address of the governance account. + string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + + // params defines the x/tokenfactory parameters to update. + // + // NOTE: All parameters must be supplied. + Params params = 2 [ + (gogoproto.nullable) = false, + (amino.dont_omitempty) = true + ]; +} + +// MsgUpdateParamsResponse defines the response structure for executing a +// MsgUpdateParams message. +// +// Since: 0.47 +message MsgUpdateParamsResponse {} diff --git a/proto/neutron/interchainqueries/genesis.proto b/proto/neutron/interchainqueries/genesis.proto index 41ff37339..41a2870ab 100644 --- a/proto/neutron/interchainqueries/genesis.proto +++ b/proto/neutron/interchainqueries/genesis.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "ibc/core/client/v1/client.proto"; import "neutron/interchainqueries/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types"; message RegisteredQuery { // The unique id of the registered query. diff --git a/proto/neutron/interchainqueries/params.proto b/proto/neutron/interchainqueries/params.proto index 7b05c1f58..bbfe620d9 100644 --- a/proto/neutron/interchainqueries/params.proto +++ b/proto/neutron/interchainqueries/params.proto @@ -4,7 +4,7 @@ package neutron.interchainqueries; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/interchainqueries/query.proto b/proto/neutron/interchainqueries/query.proto index 0a802d5d7..8f80a9180 100644 --- a/proto/neutron/interchainqueries/query.proto +++ b/proto/neutron/interchainqueries/query.proto @@ -8,7 +8,7 @@ import "neutron/interchainqueries/genesis.proto"; import "neutron/interchainqueries/params.proto"; import "neutron/interchainqueries/tx.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/neutron/interchainqueries/tx.proto b/proto/neutron/interchainqueries/tx.proto index abde7246d..b1145775f 100644 --- a/proto/neutron/interchainqueries/tx.proto +++ b/proto/neutron/interchainqueries/tx.proto @@ -11,7 +11,7 @@ import "neutron/interchainqueries/params.proto"; import "tendermint/abci/types.proto"; import "tendermint/crypto/proof.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchainqueries/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchainqueries/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/interchaintxs/v1/genesis.proto b/proto/neutron/interchaintxs/v1/genesis.proto index 940ad701a..4fcf1f727 100644 --- a/proto/neutron/interchaintxs/v1/genesis.proto +++ b/proto/neutron/interchaintxs/v1/genesis.proto @@ -4,7 +4,7 @@ package neutron.interchaintxs.v1; import "gogoproto/gogo.proto"; import "neutron/interchaintxs/v1/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchaintxs/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchaintxs/types"; // GenesisState defines the interchaintxs module's genesis state. message GenesisState { diff --git a/proto/neutron/interchaintxs/v1/params.proto b/proto/neutron/interchaintxs/v1/params.proto index 9d8febac7..0e8a08c02 100644 --- a/proto/neutron/interchaintxs/v1/params.proto +++ b/proto/neutron/interchaintxs/v1/params.proto @@ -4,7 +4,7 @@ package neutron.interchaintxs.v1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchaintxs/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchaintxs/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/neutron/interchaintxs/v1/query.proto b/proto/neutron/interchaintxs/v1/query.proto index f77bf04b7..82c966942 100644 --- a/proto/neutron/interchaintxs/v1/query.proto +++ b/proto/neutron/interchaintxs/v1/query.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "neutron/interchaintxs/v1/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchaintxs/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchaintxs/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/neutron/interchaintxs/v1/tx.proto b/proto/neutron/interchaintxs/v1/tx.proto index a2bb14202..18b973877 100644 --- a/proto/neutron/interchaintxs/v1/tx.proto +++ b/proto/neutron/interchaintxs/v1/tx.proto @@ -13,7 +13,7 @@ import "ibc/core/channel/v1/channel.proto"; import "neutron/feerefunder/fee.proto"; import "neutron/interchaintxs/v1/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/interchaintxs/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/interchaintxs/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/neutron/transfer/v1/query.proto b/proto/neutron/transfer/v1/query.proto index 088eeb892..3f67dc6b6 100644 --- a/proto/neutron/transfer/v1/query.proto +++ b/proto/neutron/transfer/v1/query.proto @@ -5,7 +5,7 @@ package neutron.transfer; import "google/api/annotations.proto"; import "ibc/applications/transfer/v1/query.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/transfer/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/transfer/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/neutron/transfer/v1/tx.proto b/proto/neutron/transfer/v1/tx.proto index 49ff17e6f..9d40f3fb1 100644 --- a/proto/neutron/transfer/v1/tx.proto +++ b/proto/neutron/transfer/v1/tx.proto @@ -9,7 +9,7 @@ import "ibc/applications/transfer/v1/transfer.proto"; import "ibc/core/client/v1/client.proto"; import "neutron/feerefunder/fee.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/transfer/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/transfer/types"; // Msg defines the ibc/transfer Msg service. service Msg { diff --git a/proto/osmosis/tokenfactory/params.proto b/proto/osmosis/tokenfactory/params.proto index 563a17a4f..778867af2 100644 --- a/proto/osmosis/tokenfactory/params.proto +++ b/proto/osmosis/tokenfactory/params.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/tokenfactory/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/tokenfactory/types"; // WhitelistedHook describes a beforeSendHook which is allowed to be added and executed // SetBeforeSendHook can only be called on denoms where the denom creator and diff --git a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto index 863570e13..5b7d79ceb 100644 --- a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto +++ b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto @@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/tokenfactory/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/tokenfactory/types"; // DenomAuthorityMetadata specifies metadata for addresses that have specific // capabilities over a token factory denom. Right now there is only one Admin diff --git a/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/proto/osmosis/tokenfactory/v1beta1/genesis.proto index 82bb3c52a..6b7fd15d6 100644 --- a/proto/osmosis/tokenfactory/v1beta1/genesis.proto +++ b/proto/osmosis/tokenfactory/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/tokenfactory/params.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/tokenfactory/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/tokenfactory/types"; // GenesisState defines the tokenfactory module's genesis state. message GenesisState { diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto index e7e8b1b7a..8374454d3 100644 --- a/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/tokenfactory/types/v1beta1"; +option go_package = "github.com/neutron-org/neutron/v5/x/tokenfactory/types/v1beta1"; // Params defines the parameters for the tokenfactory module. message Params { diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index d7b4d6f8d..0c211bf0c 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "osmosis/tokenfactory/params.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/tokenfactory/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/tokenfactory/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index e122fe71f..8b8c153bf 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "osmosis/tokenfactory/params.proto"; -option go_package = "github.com/neutron-org/neutron/v4/x/tokenfactory/types"; +option go_package = "github.com/neutron-org/neutron/v5/x/tokenfactory/types"; // Msg defines the tokefactory module's gRPC message service. service Msg { diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index b9df9c41d..466e4eb21 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -27,5 +27,5 @@ done cd .. # move proto files to the right places -cp -r github.com/neutron-org/neutron/v4/x/* x/ -rm -rf github.com \ No newline at end of file +cp -r github.com/neutron-org/neutron/v5/x/* x/ +rm -rf github.com diff --git a/tests/e2e/interchain_security_test.go b/tests/e2e/interchain_security_test.go index a78a085ad..1473ed93f 100644 --- a/tests/e2e/interchain_security_test.go +++ b/tests/e2e/interchain_security_test.go @@ -9,9 +9,9 @@ import ( icssimapp "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" "github.com/stretchr/testify/suite" - appConsumer "github.com/neutron-org/neutron/v4/app" - appparams "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" + appConsumer "github.com/neutron-org/neutron/v5/app" + appparams "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" ) // Executes the standard group of ccv tests against a consumer and provider app.go implementation. diff --git a/tests/feemarket/go.mod b/tests/feemarket/go.mod index 9de8d6631..813997bf7 100644 --- a/tests/feemarket/go.mod +++ b/tests/feemarket/go.mod @@ -1,4 +1,4 @@ -module github.com/neutron-org/neutron/v4/tests/feemarket +module github.com/neutron-org/neutron/v5/tests/feemarket go 1.22.6 diff --git a/tests/ibc/ibc_setup_test.go b/tests/ibc/ibc_setup_test.go index 51477e833..98017cb12 100644 --- a/tests/ibc/ibc_setup_test.go +++ b/tests/ibc/ibc_setup_test.go @@ -17,8 +17,8 @@ import ( ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" "github.com/stretchr/testify/suite" - appparams "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" + appparams "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" ) var ( diff --git a/testutil/apptesting/test_suite.go b/testutil/apptesting/test_suite.go index c2078edb9..ba9b4e3b3 100644 --- a/testutil/apptesting/test_suite.go +++ b/testutil/apptesting/test_suite.go @@ -17,9 +17,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil" - dexmoduletypes "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil" + dexmoduletypes "github.com/neutron-org/neutron/v5/x/dex/types" ) type KeeperTestHelper struct { diff --git a/testutil/consumer/test_helpers.go b/testutil/consumer/test_helpers.go index 0a1db0406..712e2f5c0 100644 --- a/testutil/consumer/test_helpers.go +++ b/testutil/consumer/test_helpers.go @@ -20,7 +20,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/neutron-org/neutron/v4/app" + "github.com/neutron-org/neutron/v5/app" ) // This function creates consumer module genesis state that is used as starting point for modifications diff --git a/testutil/contractmanager/keeper/contractmanager.go b/testutil/contractmanager/keeper/contractmanager.go index 5b537ea2c..dc5a3f54a 100644 --- a/testutil/contractmanager/keeper/contractmanager.go +++ b/testutil/contractmanager/keeper/contractmanager.go @@ -17,8 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func ContractManagerKeeper(t testing.TB, wasmKeeper types.WasmKeeper) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/contractmanager/network/network.go b/testutil/contractmanager/network/network.go index 914c654ce..878045594 100644 --- a/testutil/contractmanager/network/network.go +++ b/testutil/contractmanager/network/network.go @@ -23,10 +23,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil/consumer" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil/consumer" ) type ( diff --git a/testutil/cron/keeper/cron.go b/testutil/cron/keeper/cron.go index fd9e321b5..0eb83d432 100644 --- a/testutil/cron/keeper/cron.go +++ b/testutil/cron/keeper/cron.go @@ -17,8 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/cron/keeper" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/keeper" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func CronKeeper(t testing.TB, wasmMsgServer types.WasmMsgServer, accountKeeper types.AccountKeeper) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/cron/network/network.go b/testutil/cron/network/network.go index 7a419741e..525370faf 100644 --- a/testutil/cron/network/network.go +++ b/testutil/cron/network/network.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" pruningtypes "cosmossdk.io/store/pruning/types" db "github.com/cosmos/cosmos-db" @@ -16,11 +16,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/neutron-org/neutron/v4/testutil/consumer" + "github.com/neutron-org/neutron/v5/testutil/consumer" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" - "github.com/neutron-org/neutron/v4/app" + "github.com/neutron-org/neutron/v5/app" tmrand "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/testutil/dex/keeper/dex.go b/testutil/dex/keeper/dex.go index 7c4ae1c81..6be5802a3 100644 --- a/testutil/dex/keeper/dex.go +++ b/testutil/dex/keeper/dex.go @@ -16,8 +16,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func DexKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/dynamicfees/keeper/keeper.go b/testutil/dynamicfees/keeper/keeper.go index 692fb2192..d14dec8d0 100644 --- a/testutil/dynamicfees/keeper/keeper.go +++ b/testutil/dynamicfees/keeper/keeper.go @@ -17,8 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) func DynamicFeesKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/feeburner/keeper/feeburner.go b/testutil/feeburner/keeper/feeburner.go index 205e1a95c..41c186be8 100644 --- a/testutil/feeburner/keeper/feeburner.go +++ b/testutil/feeburner/keeper/feeburner.go @@ -17,8 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func FeeburnerKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/feerefunder/keeper/fee.go b/testutil/feerefunder/keeper/fee.go index c10a94367..b4ebfb1bc 100644 --- a/testutil/feerefunder/keeper/fee.go +++ b/testutil/feerefunder/keeper/fee.go @@ -16,8 +16,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/feerefunder/keeper" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/keeper" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func FeeKeeper(t testing.TB, channelKeeper types.ChannelKeeper, bankKeeper types.BankKeeper) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/globalfee/keeper/globalfee.go b/testutil/globalfee/keeper/globalfee.go index 584b7e548..27b8379c6 100644 --- a/testutil/globalfee/keeper/globalfee.go +++ b/testutil/globalfee/keeper/globalfee.go @@ -17,8 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/globalfee/keeper" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/keeper" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func GlobalFeeKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { diff --git a/testutil/integration_test_setup.go b/testutil/integration_test_setup.go index b79b2f5a9..dfdfc5806 100644 --- a/testutil/integration_test_setup.go +++ b/testutil/integration_test_setup.go @@ -23,7 +23,7 @@ import ( ibctesting "github.com/cosmos/ibc-go/v8/testing" consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/neutron-org/neutron/v4/testutil/consumer" + "github.com/neutron-org/neutron/v5/testutil/consumer" "github.com/stretchr/testify/require" ) diff --git a/testutil/interchainqueries/keeper/interchainqueries.go b/testutil/interchainqueries/keeper/interchainqueries.go index 587f7f0c7..0c3ded326 100644 --- a/testutil/interchainqueries/keeper/interchainqueries.go +++ b/testutil/interchainqueries/keeper/interchainqueries.go @@ -19,8 +19,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func InterchainQueriesKeeper( diff --git a/testutil/interchainqueries/network/network.go b/testutil/interchainqueries/network/network.go index de29f6782..ac9846444 100644 --- a/testutil/interchainqueries/network/network.go +++ b/testutil/interchainqueries/network/network.go @@ -23,10 +23,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil/consumer" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil/consumer" ) type ( diff --git a/testutil/interchaintxs/keeper/interchaintxs.go b/testutil/interchaintxs/keeper/interchaintxs.go index 87e6f3685..30a2c7497 100644 --- a/testutil/interchaintxs/keeper/interchaintxs.go +++ b/testutil/interchaintxs/keeper/interchaintxs.go @@ -17,8 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func InterchainTxsKeeper( diff --git a/testutil/interchaintxs/keeper/sudo_middleware.go b/testutil/interchaintxs/keeper/sudo_middleware.go index c0cc4f5fc..2f06c3c61 100644 --- a/testutil/interchaintxs/keeper/sudo_middleware.go +++ b/testutil/interchaintxs/keeper/sudo_middleware.go @@ -12,8 +12,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/contractmanager" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func NewSudoLimitWrapper(t testing.TB, cmKeeper types.ContractManagerKeeper, wasmKeeper types.WasmKeeper) (types.WasmKeeper, sdk.Context, *storetypes.KVStoreKey) { diff --git a/testutil/interchaintxs/network/network.go b/testutil/interchaintxs/network/network.go index f8fe9393d..a09fda763 100644 --- a/testutil/interchaintxs/network/network.go +++ b/testutil/interchaintxs/network/network.go @@ -23,11 +23,11 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" - "github.com/neutron-org/neutron/v4/testutil/consumer" + "github.com/neutron-org/neutron/v5/testutil/consumer" - "github.com/neutron-org/neutron/v4/app" + "github.com/neutron-org/neutron/v5/app" ) type ( diff --git a/testutil/mocks/contractmanager/types/expected_keepers.go b/testutil/mocks/contractmanager/types/expected_keepers.go index 92519c096..5d2ef0a4f 100644 --- a/testutil/mocks/contractmanager/types/expected_keepers.go +++ b/testutil/mocks/contractmanager/types/expected_keepers.go @@ -12,7 +12,7 @@ import ( types0 "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" - types1 "github.com/neutron-org/neutron/v4/x/contractmanager/types" + types1 "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // MockWasmKeeper is a mock of WasmKeeper interface. diff --git a/testutil/mocks/interchainqueries/keeper/verify.go b/testutil/mocks/interchainqueries/keeper/verify.go index e5f90ace2..02f03e7d9 100644 --- a/testutil/mocks/interchainqueries/keeper/verify.go +++ b/testutil/mocks/interchainqueries/keeper/verify.go @@ -14,7 +14,7 @@ import ( tendermint "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" gomock "github.com/golang/mock/gomock" - types1 "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + types1 "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // MockHeaderVerifier is a mock of HeaderVerifier interface. diff --git a/testutil/mocks/interchainqueries/types/verify.go b/testutil/mocks/interchainqueries/types/verify.go index 7289f3c02..591728e1f 100644 --- a/testutil/mocks/interchainqueries/types/verify.go +++ b/testutil/mocks/interchainqueries/types/verify.go @@ -14,7 +14,7 @@ import ( types1 "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" gomock "github.com/golang/mock/gomock" - types2 "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + types2 "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // MockHeaderVerifier is a mock of HeaderVerifier interface. diff --git a/testutil/mocks/interchaintxs/types/expected_keepers.go b/testutil/mocks/interchaintxs/types/expected_keepers.go index 68866d0b4..0c1d7c3b1 100644 --- a/testutil/mocks/interchaintxs/types/expected_keepers.go +++ b/testutil/mocks/interchaintxs/types/expected_keepers.go @@ -15,7 +15,7 @@ import ( exported "github.com/cosmos/ibc-go/v8/modules/core/exported" gomock "github.com/golang/mock/gomock" - types3 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + types3 "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) // MockAccountKeeper is a mock of AccountKeeper interface. diff --git a/testutil/mocks/transfer/types/expected_keepers.go b/testutil/mocks/transfer/types/expected_keepers.go index b1cc375eb..9e952f77b 100644 --- a/testutil/mocks/transfer/types/expected_keepers.go +++ b/testutil/mocks/transfer/types/expected_keepers.go @@ -12,7 +12,7 @@ import ( types0 "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" gomock "github.com/golang/mock/gomock" - types1 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + types1 "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) // MockWasmKeeper is a mock of WasmKeeper interface. diff --git a/testutil/test_helpers.go b/testutil/test_helpers.go index 87757dbef..de7cb00ba 100644 --- a/testutil/test_helpers.go +++ b/testutil/test_helpers.go @@ -4,18 +4,24 @@ import ( "bytes" "encoding/json" "fmt" + "math/rand" "os" "path" "testing" "time" tmrand "github.com/cometbft/cometbft/libs/rand" + cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/client" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper" icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" + "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/utils" + "github.com/neutron-org/neutron/v5/utils" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "cosmossdk.io/log" cometbfttypes "github.com/cometbft/cometbft/abci/types" @@ -34,15 +40,15 @@ import ( icssimapp "github.com/cosmos/interchain-security/v5/testutil/ibc_testing" "github.com/stretchr/testify/suite" - appparams "github.com/neutron-org/neutron/v4/app/params" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + appparams "github.com/neutron-org/neutron/v5/app/params" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck appProvider "github.com/cosmos/interchain-security/v5/app/provider" e2e "github.com/cosmos/interchain-security/v5/testutil/integration" - "github.com/neutron-org/neutron/v4/app" - ictxstypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/app" + ictxstypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" providertypes "github.com/cosmos/interchain-security/v5/x/ccv/provider/types" ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" @@ -69,6 +75,13 @@ var ( })) ) +const ( + One = 1 + Two = 2 + Three = 3 + Four = 4 +) + func init() { // ibctesting.DefaultTestingAppInit = SetupTestingApp() config.GetDefaultConfig() @@ -85,15 +98,19 @@ type IBCConnectionTestSuite struct { ChainProvider *ibctesting.TestChain ChainA *ibctesting.TestChain ChainB *ibctesting.TestChain + ChainC *ibctesting.TestChain ProviderApp e2e.ProviderApp ChainAApp e2e.ConsumerApp ChainBApp e2e.ConsumerApp - - CCVPathA *ibctesting.Path - CCVPathB *ibctesting.Path - Path *ibctesting.Path - TransferPath *ibctesting.Path + ChainCApp e2e.ConsumerApp + + CCVPathA *ibctesting.Path + CCVPathB *ibctesting.Path + CCVPathC *ibctesting.Path + Path *ibctesting.Path + TransferPath *ibctesting.Path + TransferPathAC *ibctesting.Path } func GetTestConsumerAdditionProp(chain *ibctesting.TestChain) *providertypes.ConsumerAdditionProposal { //nolint:staticcheck @@ -130,18 +147,22 @@ func (suite *IBCConnectionTestSuite) SetupTest() { suite.ChainProvider = suite.Coordinator.GetChain(ibctesting.GetChainID(1)) suite.ChainA = suite.Coordinator.GetChain(ibctesting.GetChainID(2)) suite.ChainB = suite.Coordinator.GetChain(ibctesting.GetChainID(3)) + suite.ChainC = suite.Coordinator.GetChain(ibctesting.GetChainID(4)) suite.ProviderApp = suite.ChainProvider.App.(*appProvider.App) suite.ChainAApp = suite.ChainA.App.(*app.App) suite.ChainBApp = suite.ChainB.App.(*app.App) + suite.ChainCApp = suite.ChainC.App.(*app.App) providerKeeper := suite.ProviderApp.GetProviderKeeper() consumerKeeperA := suite.ChainAApp.GetConsumerKeeper() consumerKeeperB := suite.ChainBApp.GetConsumerKeeper() + consumerKeeperC := suite.ChainCApp.GetConsumerKeeper() // valsets must match providerValUpdates := cmttypes.TM2PB.ValidatorUpdates(suite.ChainProvider.Vals) consumerAValUpdates := cmttypes.TM2PB.ValidatorUpdates(suite.ChainA.Vals) consumerBValUpdates := cmttypes.TM2PB.ValidatorUpdates(suite.ChainB.Vals) + consumerCValUpdates := cmttypes.TM2PB.ValidatorUpdates(suite.ChainB.Vals) suite.Require().True(len(providerValUpdates) == len(consumerAValUpdates), "initial valset not matching") suite.Require().True(len(providerValUpdates) == len(consumerBValUpdates), "initial valset not matching") @@ -149,8 +170,10 @@ func (suite *IBCConnectionTestSuite) SetupTest() { addr1, _ := ccv.TMCryptoPublicKeyToConsAddr(providerValUpdates[i].PubKey) addr2, _ := ccv.TMCryptoPublicKeyToConsAddr(consumerAValUpdates[i].PubKey) addr3, _ := ccv.TMCryptoPublicKeyToConsAddr(consumerBValUpdates[i].PubKey) + addr4, _ := ccv.TMCryptoPublicKeyToConsAddr(consumerCValUpdates[i].PubKey) suite.Require().True(bytes.Equal(addr1, addr2), "validator mismatch") suite.Require().True(bytes.Equal(addr1, addr3), "validator mismatch") + suite.Require().True(bytes.Equal(addr1, addr4), "validator mismatch") } ct := suite.ChainProvider.GetContext() @@ -158,6 +181,7 @@ func (suite *IBCConnectionTestSuite) SetupTest() { suite.ChainProvider.NextBlock() suite.ChainA.NextBlock() suite.ChainB.NextBlock() + suite.ChainC.NextBlock() // create consumer client on provider chain and set as consumer client for consumer chainID in provider keeper. prop1 := GetTestConsumerAdditionProp(suite.ChainA) @@ -174,6 +198,13 @@ func (suite *IBCConnectionTestSuite) SetupTest() { ) suite.Require().NoError(err) + prop3 := GetTestConsumerAdditionProp(suite.ChainC) + err = providerKeeper.CreateConsumerClient( + ct, + prop3, + ) + suite.Require().NoError(err) + // move provider to next block to commit the state suite.ChainProvider.NextBlock() @@ -205,11 +236,27 @@ func (suite *IBCConnectionTestSuite) SetupTest() { } consumerKeeperB.InitGenesis(suite.ChainB.GetContext(), &genesisStateB) + // initialize the consumer chain with the genesis state stored on the provider + consumerGenesisC, found := providerKeeper.GetConsumerGenesis( + suite.ChainProvider.GetContext(), + suite.ChainC.ChainID, + ) + suite.Require().True(found, "consumer genesis not found") + + genesisStateC := consumertypes.GenesisState{ + Params: consumerGenesisC.Params, + Provider: consumerGenesisC.Provider, + NewChain: consumerGenesisC.NewChain, + } + consumerKeeperC.InitGenesis(suite.ChainC.GetContext(), &genesisStateC) + // create paths for the CCV channel suite.CCVPathA = ibctesting.NewPath(suite.ChainA, suite.ChainProvider) suite.CCVPathB = ibctesting.NewPath(suite.ChainB, suite.ChainProvider) + suite.CCVPathC = ibctesting.NewPath(suite.ChainC, suite.ChainProvider) SetupCCVPath(suite.CCVPathA, suite) SetupCCVPath(suite.CCVPathB, suite) + SetupCCVPath(suite.CCVPathC, suite) suite.SetupCCVChannels() @@ -225,6 +272,13 @@ func (suite *IBCConnectionTestSuite) ConfigureTransferChannel() { suite.Require().NoError(err) } +func (suite *IBCConnectionTestSuite) ConfigureTransferChannelAC() { + suite.TransferPathAC = NewTransferPath(suite.ChainA, suite.ChainC, suite.ChainProvider) + suite.Coordinator.SetupConnections(suite.TransferPathAC) + err := SetupTransferPath(suite.TransferPathAC) + suite.Require().NoError(err) +} + func (suite *IBCConnectionTestSuite) FundAcc(acc sdk.AccAddress, amounts sdk.Coins) { bankKeeper := suite.GetNeutronZoneApp(suite.ChainA).BankKeeper err := bankKeeper.MintCoins(suite.ChainA.GetContext(), tokenfactorytypes.ModuleName, amounts) @@ -300,7 +354,7 @@ func testHomeDir(chainID string) string { // NewCoordinator initializes Coordinator with interchain security dummy provider and 2 neutron consumer chains func NewProviderConsumerCoordinator(t *testing.T) *ibctesting.Coordinator { coordinator := ibctesting.NewCoordinator(t, 0) - chainID := ibctesting.GetChainID(1) + chainID := ibctesting.GetChainID(One) ibctesting.DefaultTestingAppInit = icssimapp.ProviderAppIniter coordinator.Chains[chainID] = ibctesting.NewTestChain(t, coordinator, chainID) @@ -308,12 +362,16 @@ func NewProviderConsumerCoordinator(t *testing.T) *ibctesting.Coordinator { _ = config.GetDefaultConfig() sdk.SetAddrCacheEnabled(false) - chainID = ibctesting.GetChainID(2) + chainID = ibctesting.GetChainID(Two) ibctesting.DefaultTestingAppInit = SetupTestingApp(cmttypes.TM2PB.ValidatorUpdates(providerChain.Vals)) coordinator.Chains[chainID] = ibctesting.NewTestChainWithValSet(t, coordinator, chainID, providerChain.Vals, providerChain.Signers) - chainID = ibctesting.GetChainID(3) + chainID = ibctesting.GetChainID(Three) + coordinator.Chains[chainID] = ibctesting.NewTestChainWithValSet(t, coordinator, + chainID, providerChain.Vals, providerChain.Signers) + + chainID = ibctesting.GetChainID(Four) coordinator.Chains[chainID] = ibctesting.NewTestChainWithValSet(t, coordinator, chainID, providerChain.Vals, providerChain.Signers) @@ -520,3 +578,114 @@ func SetupTransferPath(path *ibctesting.Path) error { return path.EndpointB.ChanOpenConfirm() } + +// SendMsgsNoCheck is an alternative to ibctesting.TestChain.SendMsgs so that it doesn't check for errors. That should be handled by the caller +func (suite *IBCConnectionTestSuite) SendMsgsNoCheck(chain *ibctesting.TestChain, msgs ...sdk.Msg) (*cometbfttypes.ExecTxResult, error) { + // ensure the suite has the latest time + suite.Coordinator.UpdateTimeForChain(chain) + + // increment acc sequence regardless of success or failure tx execution + defer func() { + err := chain.SenderAccount.SetSequence(chain.SenderAccount.GetSequence() + 1) + if err != nil { + panic(err) + } + }() + + resp, err := SignAndDeliver(chain.TB, chain.TxConfig, chain.App.GetBaseApp(), msgs, chain.ChainID, []uint64{chain.SenderAccount.GetAccountNumber()}, []uint64{chain.SenderAccount.GetSequence()}, chain.CurrentHeader.GetTime(), chain.NextVals.Hash(), chain.SenderPrivKey) + if err != nil { + return nil, err + } + + suite.commitBlock(resp, chain) + + suite.Coordinator.IncrementTime() + + require.Len(chain.TB, resp.TxResults, 1) + txResult := resp.TxResults[0] + + if txResult.Code != 0 { + return txResult, fmt.Errorf("%s/%d: %q", txResult.Codespace, txResult.Code, txResult.Log) + } + + suite.Coordinator.IncrementTime() + + return txResult, nil +} + +// SignAndDeliver signs and delivers a transaction without asserting the results. This overrides the function +// from ibctesting +func SignAndDeliver( + tb testing.TB, + txCfg client.TxConfig, + app *baseapp.BaseApp, + msgs []sdk.Msg, + chainID string, + accNums, accSeqs []uint64, + blockTime time.Time, + nextValHash []byte, + priv ...cryptotypes.PrivKey, +) (res *cometbfttypes.ResponseFinalizeBlock, err error) { + tb.Helper() + tx, err := sims.GenSignedMockTx( + // #nosec G404 - math/rand is acceptable for non-cryptographic purposes + rand.New(rand.NewSource(time.Now().UnixNano())), + txCfg, + msgs, + sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 0)}, + sims.DefaultGenTxGas, + chainID, + accNums, + accSeqs, + priv..., + ) + if err != nil { + return nil, err + } + + txBytes, err := txCfg.TxEncoder()(tx) + if err != nil { + return nil, err + } + + return app.FinalizeBlock(&cometbfttypes.RequestFinalizeBlock{ + Height: app.LastBlockHeight() + 1, + Time: blockTime, + NextValidatorsHash: nextValHash, + Txs: [][]byte{txBytes}, + }) +} + +func (suite *IBCConnectionTestSuite) ExecuteContract(contract, sender sdk.AccAddress, msg []byte, funds sdk.Coins) ([]byte, error) { + app := suite.GetNeutronZoneApp(suite.ChainA) + contractKeeper := keeper.NewDefaultPermissionKeeper(app.WasmKeeper) + return contractKeeper.Execute(suite.ChainA.GetContext(), contract, sender, msg, funds) +} + +func (suite *IBCConnectionTestSuite) commitBlock(res *cometbfttypes.ResponseFinalizeBlock, chain *ibctesting.TestChain) { + _, err := chain.App.Commit() + require.NoError(chain.TB, err) + + // set the last header to the current header + // use nil trusted fields + chain.LastHeader = chain.CurrentTMClientHeader() + + // val set changes returned from previous block get applied to the next validators + // of this block. See tendermint spec for details. + chain.Vals = chain.NextVals + + chain.NextVals = ibctesting.ApplyValSetChanges(chain, chain.Vals, res.ValidatorUpdates) + + // increment the current header + chain.CurrentHeader = cmtproto.Header{ + ChainID: chain.ChainID, + Height: chain.App.LastBlockHeight() + 1, + AppHash: chain.App.LastCommitID().Hash, + // NOTE: the time is increased by the coordinator to maintain time synchrony amongst + // chains. + Time: chain.CurrentHeader.Time, + ValidatorsHash: chain.Vals.Hash(), + NextValidatorsHash: chain.NextVals.Hash(), + ProposerAddress: chain.CurrentHeader.ProposerAddress, + } +} diff --git a/testutil/tokenfactory/keeper/tokenfactory.go b/testutil/tokenfactory/keeper/tokenfactory.go index d122324c1..f65b1ab31 100644 --- a/testutil/tokenfactory/keeper/tokenfactory.go +++ b/testutil/tokenfactory/keeper/tokenfactory.go @@ -14,9 +14,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func TokenFactoryKeeper( diff --git a/testutil/transfer/keeper/keeper.go b/testutil/transfer/keeper/keeper.go index 1c241a0c3..327316343 100644 --- a/testutil/transfer/keeper/keeper.go +++ b/testutil/transfer/keeper/keeper.go @@ -19,8 +19,8 @@ import ( transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" - keeper "github.com/neutron-org/neutron/v4/x/transfer/keeper" - "github.com/neutron-org/neutron/v4/x/transfer/types" + keeper "github.com/neutron-org/neutron/v5/x/transfer/keeper" + "github.com/neutron-org/neutron/v5/x/transfer/types" ) func TransferKeeper( diff --git a/utils/bank.go b/utils/bank.go index 69dd997bf..5fa307fcb 100644 --- a/utils/bank.go +++ b/utils/bank.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" "github.com/cosmos/cosmos-sdk/types/query" ) diff --git a/utils/dcli/parsers.go b/utils/dcli/parsers.go index 7505304d1..6334dc70a 100644 --- a/utils/dcli/parsers.go +++ b/utils/dcli/parsers.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/pflag" - "github.com/neutron-org/neutron/v4/utils" + "github.com/neutron-org/neutron/v5/utils" ) // Parses arguments 1-1 from args diff --git a/utils/dcli/parsers_test.go b/utils/dcli/parsers_test.go index 3cdd7df25..79451f8f5 100644 --- a/utils/dcli/parsers_test.go +++ b/utils/dcli/parsers_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/utils/dcli" + "github.com/neutron-org/neutron/v5/utils/dcli" ) type testingStruct struct { diff --git a/wasmbinding/bindings/msg.go b/wasmbinding/bindings/msg.go index 8c57b202a..03d1626d4 100644 --- a/wasmbinding/bindings/msg.go +++ b/wasmbinding/bindings/msg.go @@ -7,10 +7,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - icqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - transferwrappertypes "github.com/neutron-org/neutron/v4/x/transfer/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + icqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + transferwrappertypes "github.com/neutron-org/neutron/v5/x/transfer/types" ) // ProtobufAny is a hack-struct to serialize protobuf Any message into JSON object diff --git a/wasmbinding/bindings/query.go b/wasmbinding/bindings/query.go index 88615da60..9b60fe070 100644 --- a/wasmbinding/bindings/query.go +++ b/wasmbinding/bindings/query.go @@ -6,10 +6,10 @@ import ( "cosmossdk.io/math" marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" sdktypes "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" @@ -18,7 +18,7 @@ import ( oracletypes "github.com/skip-mev/slinky/x/oracle/types" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // NeutronQuery contains neutron custom queries. diff --git a/wasmbinding/custom_querier.go b/wasmbinding/custom_querier.go index 4b37e2157..456918324 100644 --- a/wasmbinding/custom_querier.go +++ b/wasmbinding/custom_querier.go @@ -8,7 +8,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/wasmbinding/bindings" + "github.com/neutron-org/neutron/v5/wasmbinding/bindings" ) // CustomQuerier returns a function that is an implementation of custom querier mechanism for specific messages diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 8e00248d9..0eddd7d76 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -13,18 +13,18 @@ import ( "golang.org/x/exp/maps" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" - dexutils "github.com/neutron-org/neutron/v4/x/dex/utils" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" + dexutils "github.com/neutron-org/neutron/v5/x/dex/utils" - contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" + contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" "cosmossdk.io/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - crontypes "github.com/neutron-org/neutron/v4/x/cron/types" + crontypes "github.com/neutron-org/neutron/v5/x/cron/types" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" paramChange "github.com/cosmos/cosmos-sdk/x/params/types/proposal" @@ -40,16 +40,16 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" //nolint:staticcheck - "github.com/neutron-org/neutron/v4/wasmbinding/bindings" - icqkeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - icqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - ictxkeeper "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" - ictxtypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" - transferwrapperkeeper "github.com/neutron-org/neutron/v4/x/transfer/keeper" - transferwrappertypes "github.com/neutron-org/neutron/v4/x/transfer/types" + "github.com/neutron-org/neutron/v5/wasmbinding/bindings" + icqkeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + icqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + ictxkeeper "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" + ictxtypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" + transferwrapperkeeper "github.com/neutron-org/neutron/v5/x/transfer/keeper" + transferwrappertypes "github.com/neutron-org/neutron/v5/x/transfer/types" - tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func CustomMessageDecorator( diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 39b602658..25257dd85 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -15,16 +15,16 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkquery "github.com/cosmos/cosmos-sdk/types/query" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" oraclekeeper "github.com/skip-mev/slinky/x/oracle/keeper" - "github.com/neutron-org/neutron/v4/wasmbinding/bindings" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - icatypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/wasmbinding/bindings" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + icatypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func (qp *QueryPlugin) GetInterchainQueryResult(ctx sdk.Context, queryID uint64) (*bindings.QueryRegisteredQueryResultResponse, error) { @@ -201,7 +201,6 @@ func (qp *QueryPlugin) DexQuery(ctx sdk.Context, query bindings.DexQuery) (data data, err = dexQuery(ctx, query.TickLiquidityAll, qp.dexKeeper.TickLiquidityAll) case query.UserDepositsAll != nil: data, err = dexQuery(ctx, query.UserDepositsAll, qp.dexKeeper.UserDepositsAll) - default: return nil, wasmvmtypes.UnsupportedRequest{Kind: "unknown neutron.dex query type"} } diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index d4735a36c..b079e7a3c 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -1,14 +1,14 @@ package wasmbinding import ( - contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - feeburnerkeeper "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - feerefunderkeeper "github.com/neutron-org/neutron/v4/x/feerefunder/keeper" - icqkeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - icacontrollerkeeper "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" + contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + feeburnerkeeper "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + feerefunderkeeper "github.com/neutron-org/neutron/v5/x/feerefunder/keeper" + icqkeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + icacontrollerkeeper "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" - tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" + tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" oraclekeeper "github.com/skip-mev/slinky/x/oracle/keeper" diff --git a/wasmbinding/stargate_allowlist.go b/wasmbinding/stargate_allowlist.go index 1e591374a..97c1ab914 100644 --- a/wasmbinding/stargate_allowlist.go +++ b/wasmbinding/stargate_allowlist.go @@ -13,14 +13,14 @@ import ( marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types" oracletypes "github.com/skip-mev/slinky/x/oracle/types" - dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types" - - crontypes "github.com/neutron-org/neutron/v4/x/cron/types" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" - feeburnertypes "github.com/neutron-org/neutron/v4/x/feeburner/types" - interchainqueriestypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - interchaintxstypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types" + + crontypes "github.com/neutron-org/neutron/v5/x/cron/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" + feeburnertypes "github.com/neutron-org/neutron/v5/x/feeburner/types" + interchainqueriestypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + interchaintxstypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func AcceptedStargateQueries() wasmkeeper.AcceptedQueries { @@ -91,6 +91,12 @@ func AcceptedStargateQueries() wasmkeeper.AcceptedQueries { "/neutron.dex.Query/PoolByID": &dextypes.QueryPoolResponse{}, "/neutron.dex.Query/PoolMetadata": &dextypes.QueryGetPoolMetadataResponse{}, "/neutron.dex.Query/PoolMetadataAll": &dextypes.QueryAllPoolMetadataResponse{}, + "/neutron.dex.Query/SimulateDeposit": &dextypes.QuerySimulateDepositResponse{}, + "/neutron.dex.Query/SimulateWithdrawal": &dextypes.QuerySimulateWithdrawalResponse{}, + "/neutron.dex.Query/SimulatePlaceLimitOrder": &dextypes.QuerySimulatePlaceLimitOrderResponse{}, + "/neutron.dex.Query/SimulateWithdrawFilledLimitOrder": &dextypes.QuerySimulateWithdrawFilledLimitOrderResponse{}, + "/neutron.dex.Query/SimulateCancelLimitOrder": &dextypes.QuerySimulateCancelLimitOrderResponse{}, + "/neutron.dex.Query/SimulateMultiHopSwap": &dextypes.QuerySimulateMultiHopSwapResponse{}, // oracle "/slinky.oracle.v1.Query/GetAllCurrencyPairs": &oracletypes.GetAllCurrencyPairsResponse{}, diff --git a/wasmbinding/test/custom_message_test.go b/wasmbinding/test/custom_message_test.go index 7ed2fc34a..3f826c48f 100644 --- a/wasmbinding/test/custom_message_test.go +++ b/wasmbinding/test/custom_message_test.go @@ -3,35 +3,30 @@ package test import ( "encoding/json" "fmt" - "strings" "testing" - transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" - clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" - ibctesting "github.com/cosmos/ibc-go/v8/testing" - - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" - types2 "github.com/neutron-org/neutron/v4/x/cron/types" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" + types2 "github.com/neutron-org/neutron/v5/x/cron/types" "cosmossdk.io/math" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" admintypes "github.com/cosmos/admin-module/v2/x/adminmodule/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - keeper2 "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - feeburnertypes "github.com/neutron-org/neutron/v4/x/feeburner/types" + keeper2 "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + feeburnertypes "github.com/neutron-org/neutron/v5/x/feeburner/types" ibcchanneltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" "github.com/stretchr/testify/suite" - ictxtypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + ictxtypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" adminkeeper "github.com/cosmos/admin-module/v2/x/adminmodule/keeper" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" "github.com/CosmWasm/wasmd/x/wasm/keeper" "github.com/CosmWasm/wasmvm/v2/types" @@ -40,16 +35,16 @@ import ( ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/wasmbinding" - "github.com/neutron-org/neutron/v4/wasmbinding/bindings" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - icqkeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - icqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - ictxkeeper "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/wasmbinding" + "github.com/neutron-org/neutron/v5/wasmbinding/bindings" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + icqkeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + icqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + ictxkeeper "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) const FeeCollectorAddress = "neutron1vguuxez2h5ekltfj9gjd62fs5k4rl2zy5hfrncasykzw08rezpfsd2rhm7" @@ -736,100 +731,6 @@ func (suite *CustomMessengerTestSuite) TestAddRemoveSchedule() { suite.NoError(err) } -func (suite *CustomMessengerTestSuite) TestBurnTokens() { - // add NTRN to the contract - senderAddress := suite.ChainA.SenderAccounts[0].SenderAccount.GetAddress() - coinsAmnt := sdk.NewCoins(sdk.NewCoin(params.DefaultDenom, math.NewInt(int64(10_000_000)))) - bankKeeper := suite.neutron.BankKeeper - err := bankKeeper.SendCoins(suite.ctx, senderAddress, suite.contractAddress, coinsAmnt) - suite.NoError(err) - - suite.ConfigureTransferChannel() - - // add IBC denom to the contract - // Create Transfer Msg - transferMsg := transfertypes.NewMsgTransfer(suite.TransferPath.EndpointB.ChannelConfig.PortID, - suite.TransferPath.EndpointB.ChannelID, - sdk.NewCoin(params.DefaultDenom, math.NewInt(100)), - suite.ChainB.SenderAccounts[0].SenderAccount.GetAddress().String(), - strings.TrimSpace(suite.contractAddress.String()), - clienttypes.NewHeight(1, 110), - 0, - "", - ) - - // Send message from chainB to chainA - res, err := suite.TransferPath.EndpointB.Chain.SendMsgs(transferMsg) - suite.Require().NoError(err) - - // Relay transfer msg to Neutron chain - packet, err := ibctesting.ParsePacketFromEvents(res.GetEvents()) - suite.Require().NoError(err) - - suite.Require().NoError(suite.TransferPath.RelayPacket(packet)) - // ----------------------------------- - - // Add tf token to the contract - // Create denom for minting - fullMsg := bindings.NeutronMsg{ - CreateDenom: &bindings.CreateDenom{ - Subdenom: "tfdenom", - }, - } - - _, err = suite.executeNeutronMsg(suite.contractAddress, fullMsg) - suite.NoError(err) - - tfDenom := fmt.Sprintf("factory/%s/%s", suite.contractAddress.String(), fullMsg.CreateDenom.Subdenom) - - amount, ok := math.NewIntFromString("808010808") - require.True(suite.T(), ok) - - fullMsg = bindings.NeutronMsg{ - MintTokens: &bindings.MintTokens{ - Denom: tfDenom, - Amount: amount, - MintToAddress: suite.contractAddress.String(), - }, - } - - _, err = suite.executeNeutronMsg(suite.contractAddress, fullMsg) - suite.NoError(err) - - type testCase struct { - Name string - CoinToBurn sdk.Coin - } - - ibcTokenDenomHash, err := suite.neutron.TransferKeeper.DenomHash( - suite.ctx, - &transfertypes.QueryDenomHashRequest{Trace: ibctesting.TransferPort + "/" + suite.TransferPath.EndpointA.ChannelID + "/" + params.DefaultDenom}) - suite.Require().NoError(err) - - testcases := []testCase{ - {Name: "burn NTRN", CoinToBurn: sdk.NewCoin(params.DefaultDenom, math.NewInt(1000))}, - {Name: "burn tf denom", CoinToBurn: sdk.NewCoin(tfDenom, math.NewInt(1000))}, - {Name: "burn ibc denom", CoinToBurn: sdk.NewCoin("ibc/"+ibcTokenDenomHash.Hash, math.NewInt(50))}, - } - - for _, tc := range testcases { - suite.Run(tc.Name, func() { - balanceBeforeBurn := bankKeeper.GetBalance(suite.ctx, suite.contractAddress, tc.CoinToBurn.Denom) - - // Craft Burn message - msg := types.CosmosMsg{ - Bank: &types.BankMsg{Burn: &types.BurnMsg{Amount: types.Array[types.Coin]{types.Coin{Amount: tc.CoinToBurn.Amount.String(), Denom: tc.CoinToBurn.Denom}}}}, - } - - // Dispatch Burn message - _, err = suite.executeMsg(suite.contractAddress, msg) - suite.NoError(err) - - suite.Require().Equal(balanceBeforeBurn.Sub(tc.CoinToBurn), bankKeeper.GetBalance(suite.ctx, suite.contractAddress, tc.CoinToBurn.Denom)) - }) - } -} - func (suite *CustomMessengerTestSuite) TestResubmitFailureAck() { // Add failure packet := ibcchanneltypes.Packet{} diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 781151936..d3fecbcf5 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -8,9 +8,9 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/app/params" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/app/params" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types" "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" @@ -19,11 +19,11 @@ import ( host "github.com/cosmos/ibc-go/v8/modules/core/24-host" ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" - "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/wasmbinding/bindings" - icqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" - ictxtypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/wasmbinding/bindings" + icqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" + ictxtypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) type CustomQuerierTestSuite struct { diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index 63559cfa1..2752118e4 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -4,21 +4,21 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - feeburnerkeeper "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - feerefunderkeeper "github.com/neutron-org/neutron/v4/x/feerefunder/keeper" + contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + feeburnerkeeper "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + feerefunderkeeper "github.com/neutron-org/neutron/v5/x/feerefunder/keeper" adminmodulekeeper "github.com/cosmos/admin-module/v2/x/adminmodule/keeper" marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper" oraclekeeper "github.com/skip-mev/slinky/x/oracle/keeper" - interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - interchaintransactionsmodulekeeper "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" - tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - transfer "github.com/neutron-org/neutron/v4/x/transfer/keeper" + interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + interchaintransactionsmodulekeeper "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" + tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + transfer "github.com/neutron-org/neutron/v5/x/transfer/keeper" ) // RegisterCustomPlugins returns wasmkeeper.Option that we can use to connect handlers for implemented custom queries and messages to the App diff --git a/x/contractmanager/client/cli/query.go b/x/contractmanager/client/cli/query.go index 7771015c6..7d9187cea 100644 --- a/x/contractmanager/client/cli/query.go +++ b/x/contractmanager/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/contractmanager/client/cli/query_failure.go b/x/contractmanager/client/cli/query_failure.go index 6898b88f9..d990b4290 100644 --- a/x/contractmanager/client/cli/query_failure.go +++ b/x/contractmanager/client/cli/query_failure.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" "github.com/spf13/cobra" - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func CmdFailures() *cobra.Command { diff --git a/x/contractmanager/client/cli/query_failure_test.go b/x/contractmanager/client/cli/query_failure_test.go index 7d1b94b74..b95e87ff6 100644 --- a/x/contractmanager/client/cli/query_failure_test.go +++ b/x/contractmanager/client/cli/query_failure_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" @@ -20,9 +20,9 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/testutil/contractmanager/network" - "github.com/neutron-org/neutron/v4/x/contractmanager/client/cli" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/testutil/contractmanager/network" + "github.com/neutron-org/neutron/v5/x/contractmanager/client/cli" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func networkWithFailureObjects(t *testing.T, n int) (*network.Network, []types.Failure) { diff --git a/x/contractmanager/client/cli/query_params.go b/x/contractmanager/client/cli/query_params.go index 04d930c1e..75b4bac5c 100644 --- a/x/contractmanager/client/cli/query_params.go +++ b/x/contractmanager/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/contractmanager/genesis.go b/x/contractmanager/genesis.go index 14b43d835..73122a8ba 100644 --- a/x/contractmanager/genesis.go +++ b/x/contractmanager/genesis.go @@ -3,8 +3,8 @@ package contractmanager import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/contractmanager/genesis_test.go b/x/contractmanager/genesis_test.go index 449f43d9b..f383b7ae0 100644 --- a/x/contractmanager/genesis_test.go +++ b/x/contractmanager/genesis_test.go @@ -3,17 +3,17 @@ package contractmanager_test import ( "testing" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" "github.com/stretchr/testify/require" - keepertest "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + keepertest "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func TestGenesis(t *testing.T) { diff --git a/x/contractmanager/ibc_middleware.go b/x/contractmanager/ibc_middleware.go index 70e51466d..53f9b7bf7 100644 --- a/x/contractmanager/ibc_middleware.go +++ b/x/contractmanager/ibc_middleware.go @@ -9,8 +9,8 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" - contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" + contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) type SudoLimitWrapper struct { diff --git a/x/contractmanager/ibc_middleware_test.go b/x/contractmanager/ibc_middleware_test.go index ea95a8b46..2cf1ad8b1 100644 --- a/x/contractmanager/ibc_middleware_test.go +++ b/x/contractmanager/ibc_middleware_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - test_keeper "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/contractmanager/types" - contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + test_keeper "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/contractmanager/types" + contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) var ( diff --git a/x/contractmanager/keeper/failure.go b/x/contractmanager/keeper/failure.go index 5ffe886b1..4774ee978 100644 --- a/x/contractmanager/keeper/failure.go +++ b/x/contractmanager/keeper/failure.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // AddContractFailure adds a specific failure to the store. The provided address is used to determine diff --git a/x/contractmanager/keeper/failure_test.go b/x/contractmanager/keeper/failure_test.go index 8e3a62ff8..d3e026faa 100644 --- a/x/contractmanager/keeper/failure_test.go +++ b/x/contractmanager/keeper/failure_test.go @@ -7,12 +7,12 @@ import ( "strconv" "testing" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" "github.com/golang/mock/gomock" - "github.com/neutron-org/neutron/v4/testutil" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/contractmanager/types" + "github.com/neutron-org/neutron/v5/testutil" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/contractmanager/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + keepertest "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // Prevent strconv unused error diff --git a/x/contractmanager/keeper/grpc_query.go b/x/contractmanager/keeper/grpc_query.go index 332b980be..c8c613f21 100644 --- a/x/contractmanager/keeper/grpc_query.go +++ b/x/contractmanager/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/contractmanager/keeper/grpc_query_failure.go b/x/contractmanager/keeper/grpc_query_failure.go index 27b547acf..dfb82f13c 100644 --- a/x/contractmanager/keeper/grpc_query_failure.go +++ b/x/contractmanager/keeper/grpc_query_failure.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) const FailuresQueryMaxLimit uint64 = query.DefaultLimit diff --git a/x/contractmanager/keeper/grpc_query_failure_test.go b/x/contractmanager/keeper/grpc_query_failure_test.go index 88fee35b1..89d26889f 100644 --- a/x/contractmanager/keeper/grpc_query_failure_test.go +++ b/x/contractmanager/keeper/grpc_query_failure_test.go @@ -4,16 +4,16 @@ import ( "strconv" "testing" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" "github.com/cosmos/cosmos-sdk/types/query" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + keepertest "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // Prevent strconv unused error diff --git a/x/contractmanager/keeper/grpc_query_params.go b/x/contractmanager/keeper/grpc_query_params.go index d87dd6700..d7eae160a 100644 --- a/x/contractmanager/keeper/grpc_query_params.go +++ b/x/contractmanager/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/contractmanager/keeper/grpc_query_params_test.go b/x/contractmanager/keeper/grpc_query_params_test.go index 10cdb3027..7d7e01292 100644 --- a/x/contractmanager/keeper/grpc_query_params_test.go +++ b/x/contractmanager/keeper/grpc_query_params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/contractmanager/keeper/keeper.go b/x/contractmanager/keeper/keeper.go index 6d46ffe1f..02e92a200 100644 --- a/x/contractmanager/keeper/keeper.go +++ b/x/contractmanager/keeper/keeper.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) type ( diff --git a/x/contractmanager/keeper/migrations.go b/x/contractmanager/keeper/migrations.go index f9a2d6fb2..225414080 100644 --- a/x/contractmanager/keeper/migrations.go +++ b/x/contractmanager/keeper/migrations.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/neutron-org/neutron/v4/x/contractmanager/migrations/v2" + v2 "github.com/neutron-org/neutron/v5/x/contractmanager/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/contractmanager/keeper/msg_server.go b/x/contractmanager/keeper/msg_server.go index 25ae24790..5e204b6fb 100644 --- a/x/contractmanager/keeper/msg_server.go +++ b/x/contractmanager/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) type msgServer struct { diff --git a/x/contractmanager/keeper/msg_server_test.go b/x/contractmanager/keeper/msg_server_test.go index f15ffb263..cf92345f5 100644 --- a/x/contractmanager/keeper/msg_server_test.go +++ b/x/contractmanager/keeper/msg_server_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func TestMsgUpdateParamsValidate(t *testing.T) { diff --git a/x/contractmanager/keeper/params.go b/x/contractmanager/keeper/params.go index 6ae050c69..f7bd489cf 100644 --- a/x/contractmanager/keeper/params.go +++ b/x/contractmanager/keeper/params.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // GetParams get all parameters as types.Params diff --git a/x/contractmanager/keeper/params_test.go b/x/contractmanager/keeper/params_test.go index 2a11eb22d..9fe57549e 100644 --- a/x/contractmanager/keeper/params_test.go +++ b/x/contractmanager/keeper/params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func TestGetParams(t *testing.T) { diff --git a/x/contractmanager/keeper/sudo.go b/x/contractmanager/keeper/sudo.go index 93d8642ce..d813f5567 100644 --- a/x/contractmanager/keeper/sudo.go +++ b/x/contractmanager/keeper/sudo.go @@ -14,7 +14,7 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func (k Keeper) HasContractInfo(ctx context.Context, contractAddress sdk.AccAddress) bool { diff --git a/x/contractmanager/keeper/sudo_test.go b/x/contractmanager/keeper/sudo_test.go index 4de22fa97..5995a5293 100644 --- a/x/contractmanager/keeper/sudo_test.go +++ b/x/contractmanager/keeper/sudo_test.go @@ -5,16 +5,16 @@ import ( "fmt" "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - keepertest "github.com/neutron-org/neutron/v4/testutil/contractmanager/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/contractmanager/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/testutil" + keepertest "github.com/neutron-org/neutron/v5/testutil/contractmanager/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func init() { diff --git a/x/contractmanager/migrations/v2/store.go b/x/contractmanager/migrations/v2/store.go index d64c4f18e..a179a4d0e 100644 --- a/x/contractmanager/migrations/v2/store.go +++ b/x/contractmanager/migrations/v2/store.go @@ -5,7 +5,7 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) // MigrateStore performs in-place store migrations. diff --git a/x/contractmanager/migrations/v2/store_test.go b/x/contractmanager/migrations/v2/store_test.go index 90f905e52..5206582ef 100644 --- a/x/contractmanager/migrations/v2/store_test.go +++ b/x/contractmanager/migrations/v2/store_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil" - v2 "github.com/neutron-org/neutron/v4/x/contractmanager/migrations/v2" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" - typesv1 "github.com/neutron-org/neutron/v4/x/contractmanager/types/v1" + "github.com/neutron-org/neutron/v5/testutil" + v2 "github.com/neutron-org/neutron/v5/x/contractmanager/migrations/v2" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" + typesv1 "github.com/neutron-org/neutron/v5/x/contractmanager/types/v1" ) type V2ContractManagerMigrationTestSuite struct { diff --git a/x/contractmanager/module.go b/x/contractmanager/module.go index 7941d6f85..96ae997cd 100644 --- a/x/contractmanager/module.go +++ b/x/contractmanager/module.go @@ -21,9 +21,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/contractmanager/client/cli" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/client/cli" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) var ( diff --git a/x/contractmanager/types/failure.pb.go b/x/contractmanager/types/failure.pb.go index 635899d81..50379216e 100644 --- a/x/contractmanager/types/failure.pb.go +++ b/x/contractmanager/types/failure.pb.go @@ -122,9 +122,9 @@ var fileDescriptor_fba0c26e85dad46e = []byte{ 0xfc, 0x22, 0x09, 0x16, 0xb0, 0x51, 0x10, 0x8e, 0x53, 0xf0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, - 0x43, 0xbd, 0xa3, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xe8, 0x57, 0x60, 0x04, 0x43, + 0x43, 0xbd, 0xa3, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x60, 0x04, 0x43, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x27, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x5c, 0xc6, 0x5f, 0x6f, 0x2e, 0x01, 0x00, 0x00, + 0xaf, 0x56, 0xad, 0x59, 0x2e, 0x01, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { diff --git a/x/contractmanager/types/genesis.pb.go b/x/contractmanager/types/genesis.pb.go index fbf415eda..89a99d0a0 100644 --- a/x/contractmanager/types/genesis.pb.go +++ b/x/contractmanager/types/genesis.pb.go @@ -100,9 +100,9 @@ var fileDescriptor_cf4a1534315a7490 = []byte{ 0x44, 0x35, 0xd4, 0x18, 0x1e, 0x98, 0x66, 0x9f, 0xcc, 0xe2, 0x12, 0xa7, 0xe0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, - 0xce, 0xcf, 0xd5, 0x87, 0x9a, 0xac, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xe8, 0x57, + 0xce, 0xcf, 0xd5, 0x87, 0x9a, 0xac, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x60, 0x78, 0xbc, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x71, 0x63, 0x40, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x2d, 0x60, 0xd9, 0xc7, 0x9d, 0x01, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xde, 0xf0, 0x2b, 0xf1, 0x9d, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/contractmanager/types/genesis_test.go b/x/contractmanager/types/genesis_test.go index 4ecf069c8..ae4c201a0 100644 --- a/x/contractmanager/types/genesis_test.go +++ b/x/contractmanager/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/contractmanager/types/params.pb.go b/x/contractmanager/types/params.pb.go index a3294bbd0..dc4c2cef7 100644 --- a/x/contractmanager/types/params.pb.go +++ b/x/contractmanager/types/params.pb.go @@ -87,9 +87,9 @@ var fileDescriptor_121b05e48c7a8737 = []byte{ 0xdc, 0x13, 0x8b, 0x7d, 0x40, 0xe2, 0x56, 0x2c, 0x33, 0x16, 0xc8, 0x33, 0x38, 0x05, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x65, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, - 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x49, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0x89, + 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x49, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0x86, 0x4f, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x4e, 0x33, 0x06, 0x04, - 0x00, 0x00, 0xff, 0xff, 0xa9, 0x1e, 0x26, 0x1c, 0xf1, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x5a, 0x8e, 0xd4, 0x2a, 0xf1, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/contractmanager/types/query.pb.go b/x/contractmanager/types/query.pb.go index 031468e29..b18090f3f 100644 --- a/x/contractmanager/types/query.pb.go +++ b/x/contractmanager/types/query.pb.go @@ -335,12 +335,12 @@ func init() { var fileDescriptor_f9524a427f219917 = []byte{ // 557 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x41, 0x4f, 0x13, 0x41, - 0x1c, 0xc5, 0x3b, 0x05, 0x0a, 0x8c, 0x89, 0x26, 0x63, 0x8d, 0x4d, 0xa3, 0xdb, 0xb2, 0xa8, 0xa0, - 0xd8, 0x99, 0x00, 0x1e, 0xd4, 0xc4, 0x04, 0x7b, 0xc0, 0x78, 0x31, 0xb8, 0x7a, 0x30, 0x5e, 0xcc, - 0xb4, 0x1d, 0xd7, 0x4d, 0xe8, 0xce, 0xb2, 0x33, 0x4b, 0x20, 0x84, 0x8b, 0x17, 0x2f, 0x1e, 0x4c, - 0xf4, 0x23, 0xe8, 0xd9, 0xaf, 0xc1, 0x91, 0xc4, 0x8b, 0x27, 0x63, 0x5a, 0x3f, 0x88, 0xe9, 0xcc, - 0xbf, 0x85, 0x85, 0xac, 0xdb, 0x5e, 0xbc, 0x6d, 0xa7, 0xef, 0xbd, 0xff, 0x6f, 0xdf, 0xfc, 0x5b, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x41, 0x6b, 0x13, 0x41, + 0x1c, 0xc5, 0x33, 0x69, 0x9b, 0xb6, 0x23, 0x28, 0x8c, 0x11, 0x43, 0xd0, 0x4d, 0xba, 0x55, 0x5b, + 0xad, 0x99, 0xa1, 0x2d, 0x82, 0x0a, 0x42, 0xcd, 0xa1, 0xe2, 0x45, 0xea, 0xea, 0x41, 0xbc, 0xc8, + 0x24, 0x19, 0xd7, 0x85, 0x66, 0x67, 0xbb, 0x33, 0x5b, 0x5a, 0x4a, 0x2f, 0x5e, 0xbc, 0x78, 0x10, + 0xf4, 0x23, 0xe8, 0xd9, 0xaf, 0xd1, 0x63, 0xc1, 0x8b, 0x27, 0x91, 0xc4, 0x0f, 0x22, 0x99, 0xf9, + 0x27, 0xed, 0xb6, 0xac, 0x9b, 0x5c, 0xbc, 0x6d, 0x26, 0xef, 0xbd, 0xff, 0x6f, 0xdf, 0xfc, 0x13, 0xbc, 0x18, 0x8a, 0x44, 0xc7, 0x32, 0x64, 0x6d, 0x19, 0xea, 0x98, 0xb7, 0x75, 0x97, 0x87, 0xdc, 0x17, 0x31, 0xdb, 0x49, 0x44, 0xbc, 0x4f, 0xa3, 0x58, 0x6a, 0x49, 0xae, 0x82, 0x88, 0x9e, 0x11, 0x55, 0xef, 0xb4, 0xa5, 0xea, 0x4a, 0xc5, 0x5a, 0x5c, 0x09, 0xeb, 0x60, 0xbb, 0xab, 0x2d, 0xa1, @@ -369,7 +369,7 @@ var fileDescriptor_f9524a427f219917 = []byte{ 0x41, 0xbf, 0x7b, 0x0e, 0xfa, 0xd4, 0x77, 0x0a, 0xc7, 0x7d, 0xa7, 0xf0, 0xb3, 0xef, 0x14, 0x5e, 0x3f, 0xf0, 0x03, 0xfd, 0x2e, 0x69, 0xd1, 0xb6, 0xec, 0x0e, 0x63, 0x1a, 0x32, 0xf6, 0x47, 0x91, 0xbb, 0xf7, 0xd8, 0xde, 0xb9, 0x5c, 0xbd, 0x1f, 0x09, 0xd5, 0x2a, 0x99, 0x3f, 0xc7, 0xf5, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x22, 0xf1, 0x02, 0x83, 0x09, 0x06, 0x00, 0x00, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x61, 0xf0, 0xb5, 0x09, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/tx.pb.go b/x/contractmanager/types/tx.pb.go index 3a69490ae..2e1a57005 100644 --- a/x/contractmanager/types/tx.pb.go +++ b/x/contractmanager/types/tx.pb.go @@ -159,8 +159,8 @@ var fileDescriptor_4dc444ed708d435f = []byte{ 0xa7, 0xe0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x1a, 0xae, 0x9b, 0x5f, 0x94, 0x0e, 0x63, - 0xeb, 0x97, 0x99, 0xe8, 0x57, 0x60, 0x26, 0xa6, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xa4, - 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xe1, 0xbf, 0xee, 0x74, 0x02, 0x00, 0x00, + 0xeb, 0x97, 0x99, 0xea, 0x57, 0x60, 0x26, 0xa6, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xa4, + 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x43, 0x71, 0x4d, 0xd8, 0x74, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/contractmanager/types/v1/failure.pb.go b/x/contractmanager/types/v1/failure.pb.go index 597eb369b..4eadc5395 100644 --- a/x/contractmanager/types/v1/failure.pb.go +++ b/x/contractmanager/types/v1/failure.pb.go @@ -127,9 +127,9 @@ var fileDescriptor_c0f2c436fd0f28b7 = []byte{ 0x09, 0xc9, 0xd9, 0x21, 0x95, 0x05, 0xa9, 0x4e, 0x61, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x93, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, - 0xf5, 0x87, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, 0xad, 0x5f, 0x66, 0xa2, 0x5f, 0x81, 0x11, 0x04, 0x20, + 0xf5, 0x87, 0x6e, 0x7e, 0x51, 0x3a, 0x8c, 0xad, 0x5f, 0x66, 0xaa, 0x5f, 0x81, 0x11, 0x04, 0x20, 0x2b, 0x8a, 0xf5, 0xcb, 0x0c, 0x93, 0xd8, 0xc0, 0x21, 0x60, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0xd7, 0xff, 0xd9, 0x5a, 0x2d, 0x01, 0x00, 0x00, + 0x42, 0x2b, 0xa9, 0xcf, 0x2d, 0x01, 0x00, 0x00, } func (m *Failure) Marshal() (dAtA []byte, err error) { diff --git a/x/cron/client/cli/query.go b/x/cron/client/cli/query.go index 8dc195133..0b8d433e1 100644 --- a/x/cron/client/cli/query.go +++ b/x/cron/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/cron/client/cli/query_params.go b/x/cron/client/cli/query_params.go index 3a8de94e3..0500a73ce 100644 --- a/x/cron/client/cli/query_params.go +++ b/x/cron/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/cron/client/cli/query_schedule.go b/x/cron/client/cli/query_schedule.go index 4b11241c3..08142d832 100644 --- a/x/cron/client/cli/query_schedule.go +++ b/x/cron/client/cli/query_schedule.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func CmdListSchedule() *cobra.Command { diff --git a/x/cron/client/cli/query_schedule_test.go b/x/cron/client/cli/query_schedule_test.go index 7cec8578f..399ed6abe 100644 --- a/x/cron/client/cli/query_schedule_test.go +++ b/x/cron/client/cli/query_schedule_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/testutil/cron/network" - "github.com/neutron-org/neutron/v4/x/cron/client/cli" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/cron/network" + "github.com/neutron-org/neutron/v5/x/cron/client/cli" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func networkWithScheduleObjects(t *testing.T, n int) (*network.Network, []types.Schedule) { diff --git a/x/cron/client/cli/tx.go b/x/cron/client/cli/tx.go index 7e7182ef5..565daeb0d 100644 --- a/x/cron/client/cli/tx.go +++ b/x/cron/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/cron/genesis.go b/x/cron/genesis.go index 525840e26..78b82c5ae 100644 --- a/x/cron/genesis.go +++ b/x/cron/genesis.go @@ -3,8 +3,8 @@ package cron import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/cron/keeper" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/keeper" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/cron/genesis_test.go b/x/cron/genesis_test.go index 4b9f2e474..c9efb9e10 100644 --- a/x/cron/genesis_test.go +++ b/x/cron/genesis_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/testutil/cron/keeper" - "github.com/neutron-org/neutron/v4/x/cron" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/cron/keeper" + "github.com/neutron-org/neutron/v5/x/cron" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func TestGenesis(t *testing.T) { diff --git a/x/cron/keeper/grpc_query.go b/x/cron/keeper/grpc_query.go index 865fab29f..50017a573 100644 --- a/x/cron/keeper/grpc_query.go +++ b/x/cron/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/cron/keeper/grpc_query_params.go b/x/cron/keeper/grpc_query_params.go index d2bad8b5d..a646a7abb 100644 --- a/x/cron/keeper/grpc_query_params.go +++ b/x/cron/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/cron/keeper/grpc_query_params_test.go b/x/cron/keeper/grpc_query_params_test.go index c84ef335c..64d1d4a13 100644 --- a/x/cron/keeper/grpc_query_params_test.go +++ b/x/cron/keeper/grpc_query_params_test.go @@ -3,11 +3,11 @@ package keeper_test import ( "testing" - testkeeper "github.com/neutron-org/neutron/v4/testutil/cron/keeper" + testkeeper "github.com/neutron-org/neutron/v5/testutil/cron/keeper" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/cron/keeper/grpc_query_schedule.go b/x/cron/keeper/grpc_query_schedule.go index 0e060c016..4b4d1d5ee 100644 --- a/x/cron/keeper/grpc_query_schedule.go +++ b/x/cron/keeper/grpc_query_schedule.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func (k Keeper) Schedules(c context.Context, req *types.QuerySchedulesRequest) (*types.QuerySchedulesResponse, error) { diff --git a/x/cron/keeper/grpc_query_schedule_test.go b/x/cron/keeper/grpc_query_schedule_test.go index a132fc8d4..12bb5c1f3 100644 --- a/x/cron/keeper/grpc_query_schedule_test.go +++ b/x/cron/keeper/grpc_query_schedule_test.go @@ -10,10 +10,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - testutil_keeper "github.com/neutron-org/neutron/v4/testutil/cron/keeper" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + testutil_keeper "github.com/neutron-org/neutron/v5/testutil/cron/keeper" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // Prevent strconv unused error diff --git a/x/cron/keeper/keeper.go b/x/cron/keeper/keeper.go index 070f18b2d..18d45263d 100644 --- a/x/cron/keeper/keeper.go +++ b/x/cron/keeper/keeper.go @@ -17,7 +17,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) var ( diff --git a/x/cron/keeper/keeper_test.go b/x/cron/keeper/keeper_test.go index d58553c56..790068b94 100644 --- a/x/cron/keeper/keeper_test.go +++ b/x/cron/keeper/keeper_test.go @@ -12,10 +12,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - testutil_keeper "github.com/neutron-org/neutron/v4/testutil/cron/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/cron/types" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/testutil" + testutil_keeper "github.com/neutron-org/neutron/v5/testutil/cron/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // ExecuteReadySchedules: diff --git a/x/cron/keeper/migrations.go b/x/cron/keeper/migrations.go index 0166a8da9..b4c394bb1 100644 --- a/x/cron/keeper/migrations.go +++ b/x/cron/keeper/migrations.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/neutron-org/neutron/v4/x/cron/migrations/v2" + v2 "github.com/neutron-org/neutron/v5/x/cron/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/cron/keeper/msg_server.go b/x/cron/keeper/msg_server.go index c42a0d1c4..ccb0bcbc4 100644 --- a/x/cron/keeper/msg_server.go +++ b/x/cron/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) type msgServer struct { diff --git a/x/cron/keeper/msg_server_test.go b/x/cron/keeper/msg_server_test.go index ef10b1ffc..b8f318515 100644 --- a/x/cron/keeper/msg_server_test.go +++ b/x/cron/keeper/msg_server_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/cron/keeper" - cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/testutil" + testkeeper "github.com/neutron-org/neutron/v5/testutil/cron/keeper" + cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func TestMsgAddScheduleValidate(t *testing.T) { diff --git a/x/cron/keeper/params.go b/x/cron/keeper/params.go index 5d0b64820..81b7321e4 100644 --- a/x/cron/keeper/params.go +++ b/x/cron/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // GetParams get all parameters as types.Params diff --git a/x/cron/keeper/params_test.go b/x/cron/keeper/params_test.go index c31624ca9..be0630f66 100644 --- a/x/cron/keeper/params_test.go +++ b/x/cron/keeper/params_test.go @@ -3,15 +3,15 @@ package keeper_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" - "github.com/neutron-org/neutron/v4/testutil" + "github.com/neutron-org/neutron/v5/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/cron/keeper" + testkeeper "github.com/neutron-org/neutron/v5/testutil/cron/keeper" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func TestGetParams(t *testing.T) { diff --git a/x/cron/migrations/v2/store.go b/x/cron/migrations/v2/store.go index f3311aba0..dae71e591 100644 --- a/x/cron/migrations/v2/store.go +++ b/x/cron/migrations/v2/store.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // MigrateStore performs in-place store migrations. diff --git a/x/cron/migrations/v2/store_test.go b/x/cron/migrations/v2/store_test.go index 6b6f46355..a1a3c4fef 100644 --- a/x/cron/migrations/v2/store_test.go +++ b/x/cron/migrations/v2/store_test.go @@ -6,10 +6,10 @@ import ( "cosmossdk.io/store/prefix" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil" - v2 "github.com/neutron-org/neutron/v4/x/cron/migrations/v2" - "github.com/neutron-org/neutron/v4/x/cron/types" - v1types "github.com/neutron-org/neutron/v4/x/cron/types/v1" + "github.com/neutron-org/neutron/v5/testutil" + v2 "github.com/neutron-org/neutron/v5/x/cron/migrations/v2" + "github.com/neutron-org/neutron/v5/x/cron/types" + v1types "github.com/neutron-org/neutron/v5/x/cron/types/v1" ) type V2CronMigrationTestSuite struct { diff --git a/x/cron/module.go b/x/cron/module.go index f9957651e..e86ee8745 100644 --- a/x/cron/module.go +++ b/x/cron/module.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/cron/client/cli" - "github.com/neutron-org/neutron/v4/x/cron/keeper" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/client/cli" + "github.com/neutron-org/neutron/v5/x/cron/keeper" + "github.com/neutron-org/neutron/v5/x/cron/types" ) var ( diff --git a/x/cron/module_simulation.go b/x/cron/module_simulation.go index 63c9dd7ae..0ada92486 100644 --- a/x/cron/module_simulation.go +++ b/x/cron/module_simulation.go @@ -7,8 +7,8 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - cronsimulation "github.com/neutron-org/neutron/v4/x/cron/simulation" - "github.com/neutron-org/neutron/v4/x/cron/types" + cronsimulation "github.com/neutron-org/neutron/v5/x/cron/simulation" + "github.com/neutron-org/neutron/v5/x/cron/types" ) // avoid unused import issue diff --git a/x/cron/types/genesis.pb.go b/x/cron/types/genesis.pb.go index 274598ad7..b3678689b 100644 --- a/x/cron/types/genesis.pb.go +++ b/x/cron/types/genesis.pb.go @@ -96,9 +96,9 @@ var fileDescriptor_7c41f2dea8ad83c2 = []byte{ 0x1b, 0x00, 0x96, 0x83, 0xea, 0x84, 0xaa, 0x74, 0xf2, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xbd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, - 0xa8, 0x39, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0x89, 0x7e, 0x05, 0xc4, 0x67, 0x25, - 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x7f, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9b, - 0x07, 0x7e, 0x51, 0x51, 0x01, 0x00, 0x00, + 0xa8, 0x39, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0xc4, 0x67, 0x25, + 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x7f, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5b, + 0x63, 0x56, 0x46, 0x51, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/cron/types/genesis_test.go b/x/cron/types/genesis_test.go index ac1e2c69c..04d14471f 100644 --- a/x/cron/types/genesis_test.go +++ b/x/cron/types/genesis_test.go @@ -3,11 +3,11 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/cron/types" + "github.com/neutron-org/neutron/v5/x/cron/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/cron/types/params.pb.go b/x/cron/types/params.pb.go index e927ec42a..6f0715acb 100644 --- a/x/cron/types/params.pb.go +++ b/x/cron/types/params.pb.go @@ -95,9 +95,9 @@ var fileDescriptor_efa4f5c14a68f6e5 = []byte{ 0x2b, 0x96, 0x19, 0x0b, 0xe4, 0x19, 0x9c, 0x3c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x2f, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, - 0x32, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0xcc, 0x44, 0xbf, 0x02, 0xe2, 0x8b, 0x92, 0xca, - 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x0b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x83, 0x18, - 0x33, 0xb9, 0xe2, 0x00, 0x00, 0x00, + 0x32, 0xdd, 0xfc, 0xa2, 0x74, 0x18, 0x5b, 0xbf, 0xcc, 0x54, 0xbf, 0x02, 0xe2, 0x8b, 0x92, 0xca, + 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x0b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x43, 0x7c, + 0x1b, 0xae, 0xe2, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/cron/types/query.pb.go b/x/cron/types/query.pb.go index 912a44eaa..4d8b3eedb 100644 --- a/x/cron/types/query.pb.go +++ b/x/cron/types/query.pb.go @@ -313,38 +313,38 @@ func init() { func init() { proto.RegisterFile("neutron/cron/query.proto", fileDescriptor_e02f33367c9498fe) } var fileDescriptor_e02f33367c9498fe = []byte{ - // 495 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xbf, 0x6e, 0x13, 0x41, - 0x10, 0xc6, 0x7d, 0x26, 0x58, 0xf1, 0x40, 0x35, 0x18, 0x63, 0x8e, 0x70, 0x09, 0x07, 0x09, 0x08, - 0x29, 0xbb, 0x8a, 0xa1, 0x40, 0x94, 0x29, 0x08, 0x74, 0xc1, 0x50, 0xd1, 0xa0, 0xb5, 0x59, 0x5d, - 0x2c, 0xe2, 0xdd, 0xcb, 0xed, 0x9e, 0x45, 0x84, 0x90, 0x10, 0x4f, 0x80, 0x44, 0xcd, 0xfb, 0xa4, - 0x8c, 0x44, 0x43, 0x85, 0x90, 0x4d, 0xcf, 0x2b, 0x44, 0xb7, 0x7f, 0x1c, 0x5f, 0x7c, 0x8a, 0x1b, - 0x6b, 0x75, 0xf3, 0xcd, 0xf7, 0xfd, 0x76, 0x67, 0x0c, 0x1d, 0xc1, 0x73, 0x9d, 0x49, 0x41, 0x07, - 0xc5, 0xcf, 0x51, 0xce, 0xb3, 0x63, 0x92, 0x66, 0x52, 0x4b, 0xbc, 0xee, 0x2a, 0xa4, 0xa8, 0x84, - 0x8f, 0x07, 0x52, 0x8d, 0xa4, 0xa2, 0x7d, 0xa6, 0xb8, 0x95, 0xd1, 0xf1, 0x4e, 0x9f, 0x6b, 0xb6, - 0x43, 0x53, 0x96, 0x0c, 0x05, 0xd3, 0x43, 0x29, 0x6c, 0x67, 0xd8, 0x4a, 0x64, 0x22, 0xcd, 0x91, - 0x16, 0x27, 0xf7, 0x75, 0x2d, 0x91, 0x32, 0x39, 0xe4, 0x94, 0xa5, 0x43, 0xca, 0x84, 0x90, 0xda, - 0xb4, 0x28, 0x57, 0xbd, 0x5d, 0xe2, 0x48, 0x59, 0xc6, 0x46, 0xbe, 0x74, 0xa7, 0x54, 0x52, 0x83, - 0x03, 0xfe, 0x21, 0x3f, 0xe4, 0xb6, 0x18, 0xb7, 0x00, 0x5f, 0x17, 0x34, 0xfb, 0xa6, 0xa3, 0xc7, - 0x8f, 0x72, 0xae, 0x74, 0xfc, 0x0a, 0x6e, 0x94, 0xbe, 0xaa, 0x54, 0x0a, 0xc5, 0xb1, 0x0b, 0x0d, - 0xeb, 0xdc, 0x09, 0x36, 0x82, 0x47, 0xd7, 0xba, 0x2d, 0x32, 0x7f, 0x47, 0x62, 0xd5, 0xbb, 0x2b, - 0x27, 0x7f, 0xd6, 0x6b, 0x3d, 0xa7, 0x8c, 0xb7, 0xe1, 0x96, 0xb1, 0xda, 0xe3, 0xfa, 0x8d, 0x8b, - 0x76, 0x29, 0x88, 0xb0, 0x22, 0xd8, 0x88, 0x1b, 0xb3, 0x66, 0xcf, 0x9c, 0xe3, 0xb7, 0xd0, 0x59, - 0x94, 0xbb, 0xf8, 0x67, 0xb0, 0xea, 0xe9, 0x1d, 0x40, 0xbb, 0x0c, 0xe0, 0x3b, 0x1c, 0xc2, 0x4c, - 0x1d, 0xbf, 0x87, 0x9b, 0xc6, 0xd5, 0x0b, 0xfc, 0x45, 0xf1, 0x05, 0xc0, 0xf9, 0xf3, 0x3b, 0xd3, - 0x2d, 0x62, 0x67, 0x45, 0x8a, 0x59, 0x11, 0x3b, 0x52, 0x37, 0x2b, 0xb2, 0xcf, 0x12, 0x8f, 0xdf, - 0x9b, 0xeb, 0x8c, 0x7f, 0x06, 0xd0, 0xbe, 0x98, 0xe0, 0xa8, 0x9f, 0x43, 0xd3, 0x73, 0x14, 0xef, - 0x76, 0x65, 0x29, 0xf6, 0xb9, 0x1c, 0xf7, 0x4a, 0x78, 0x75, 0x83, 0xf7, 0x70, 0x29, 0x9e, 0x0d, - 0x9e, 0xe7, 0xeb, 0xfe, 0xaf, 0xc3, 0x55, 0xc3, 0x87, 0x1f, 0xa1, 0x61, 0xe7, 0x84, 0x1b, 0x65, - 0x8a, 0xc5, 0x35, 0x08, 0xef, 0x5d, 0xa2, 0xb0, 0x21, 0xf1, 0xda, 0xb7, 0x5f, 0xff, 0x7e, 0xd4, - 0xdb, 0xd8, 0xa2, 0x15, 0x0b, 0x88, 0x5f, 0x03, 0x58, 0xf5, 0xb7, 0xc3, 0xcd, 0x0a, 0xb7, 0xc5, - 0xad, 0x08, 0xb7, 0x96, 0xc9, 0x5c, 0xf2, 0xa6, 0x49, 0x5e, 0xc7, 0xbb, 0xb4, 0x72, 0xbf, 0xe9, - 0xe7, 0x62, 0x9f, 0xbe, 0xe0, 0x18, 0x9a, 0xb3, 0x99, 0xe0, 0xfd, 0x0a, 0xef, 0x8b, 0x3b, 0x11, - 0x3e, 0xb8, 0x5c, 0xe4, 0xe2, 0x23, 0x13, 0xdf, 0xc1, 0x76, 0x75, 0xfc, 0xee, 0xcb, 0x93, 0x49, - 0x14, 0x9c, 0x4e, 0xa2, 0xe0, 0xef, 0x24, 0x0a, 0xbe, 0x4f, 0xa3, 0xda, 0xe9, 0x34, 0xaa, 0xfd, - 0x9e, 0x46, 0xb5, 0x77, 0x24, 0x19, 0xea, 0x83, 0xbc, 0x4f, 0x06, 0x72, 0xe4, 0x7b, 0xb7, 0x65, - 0x96, 0xcc, 0x7c, 0xc6, 0x4f, 0xe9, 0x27, 0x6b, 0xa6, 0x8f, 0x53, 0xae, 0xfa, 0x0d, 0xf3, 0x4f, - 0x7d, 0x72, 0x16, 0x00, 0x00, 0xff, 0xff, 0x89, 0x23, 0xc7, 0x75, 0x6b, 0x04, 0x00, 0x00, + // 496 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcf, 0x6b, 0x13, 0x41, + 0x14, 0xc7, 0xb3, 0xb1, 0x86, 0xe6, 0xe9, 0xe9, 0x19, 0x63, 0x5c, 0xeb, 0xb6, 0xae, 0xb6, 0x8a, + 0xd0, 0x19, 0x1a, 0x11, 0xc4, 0x63, 0x0f, 0x56, 0x6f, 0x35, 0x7a, 0xf2, 0x22, 0x93, 0x38, 0x6c, + 0x83, 0xcd, 0xcc, 0x76, 0x67, 0x36, 0x58, 0x44, 0x10, 0xff, 0x02, 0xc1, 0xb3, 0xff, 0x4f, 0x8f, + 0x05, 0x2f, 0x9e, 0x44, 0x12, 0xef, 0xfe, 0x0b, 0x65, 0xe7, 0x47, 0x9a, 0x6d, 0x96, 0xe6, 0x12, + 0x86, 0x7d, 0xdf, 0xf7, 0xfd, 0x7e, 0x66, 0xde, 0x0b, 0x74, 0x04, 0xcf, 0x75, 0x26, 0x05, 0x1d, + 0x14, 0x3f, 0x47, 0x39, 0xcf, 0x8e, 0x49, 0x9a, 0x49, 0x2d, 0xf1, 0xba, 0xab, 0x90, 0xa2, 0x12, + 0x3e, 0x1e, 0x48, 0x35, 0x92, 0x8a, 0xf6, 0x99, 0xe2, 0x56, 0x46, 0xc7, 0x3b, 0x7d, 0xae, 0xd9, + 0x0e, 0x4d, 0x59, 0x32, 0x14, 0x4c, 0x0f, 0xa5, 0xb0, 0x9d, 0x61, 0x2b, 0x91, 0x89, 0x34, 0x47, + 0x5a, 0x9c, 0xdc, 0xd7, 0xb5, 0x44, 0xca, 0xe4, 0x90, 0x53, 0x96, 0x0e, 0x29, 0x13, 0x42, 0x6a, + 0xd3, 0xa2, 0x5c, 0xf5, 0x76, 0x89, 0x23, 0x65, 0x19, 0x1b, 0xf9, 0xd2, 0x9d, 0x52, 0x49, 0x0d, + 0x0e, 0xf8, 0x87, 0xfc, 0x90, 0xdb, 0x62, 0xdc, 0x02, 0x7c, 0x5d, 0xd0, 0xec, 0x9b, 0x8e, 0x1e, + 0x3f, 0xca, 0xb9, 0xd2, 0xf1, 0x2b, 0xb8, 0x51, 0xfa, 0xaa, 0x52, 0x29, 0x14, 0xc7, 0x2e, 0x34, + 0xac, 0x73, 0x27, 0xd8, 0x08, 0x1e, 0x5d, 0xeb, 0xb6, 0xc8, 0xfc, 0x1d, 0x89, 0x55, 0xef, 0xae, + 0x9c, 0xfc, 0x59, 0xaf, 0xf5, 0x9c, 0x32, 0xde, 0x86, 0x5b, 0xc6, 0x6a, 0x8f, 0xeb, 0x37, 0x2e, + 0xda, 0xa5, 0x20, 0xc2, 0x8a, 0x60, 0x23, 0x6e, 0xcc, 0x9a, 0x3d, 0x73, 0x8e, 0xdf, 0x42, 0x67, + 0x51, 0xee, 0xe2, 0x9f, 0xc1, 0xaa, 0xa7, 0x77, 0x00, 0xed, 0x32, 0x80, 0xef, 0x70, 0x08, 0x33, + 0x75, 0xfc, 0x1e, 0x6e, 0x1a, 0x57, 0x2f, 0xf0, 0x17, 0xc5, 0x17, 0x00, 0xe7, 0xcf, 0xef, 0x4c, + 0xb7, 0x88, 0x9d, 0x15, 0x29, 0x66, 0x45, 0xec, 0x48, 0xdd, 0xac, 0xc8, 0x3e, 0x4b, 0x3c, 0x7e, + 0x6f, 0xae, 0x33, 0xfe, 0x19, 0x40, 0xfb, 0x62, 0x82, 0xa3, 0x7e, 0x0e, 0x4d, 0xcf, 0x51, 0xbc, + 0xdb, 0x95, 0xa5, 0xd8, 0xe7, 0x72, 0xdc, 0x2b, 0xe1, 0xd5, 0x0d, 0xde, 0xc3, 0xa5, 0x78, 0x36, + 0x78, 0x9e, 0xaf, 0xfb, 0xbf, 0x0e, 0x57, 0x0d, 0x1f, 0x7e, 0x84, 0x86, 0x9d, 0x13, 0x6e, 0x94, + 0x29, 0x16, 0xd7, 0x20, 0xbc, 0x77, 0x89, 0xc2, 0x86, 0xc4, 0x6b, 0xdf, 0x7e, 0xfd, 0xfb, 0x51, + 0x6f, 0x63, 0x8b, 0x56, 0x2c, 0x20, 0x7e, 0x0d, 0x60, 0xd5, 0xdf, 0x0e, 0x37, 0x2b, 0xdc, 0x16, + 0xb7, 0x22, 0xdc, 0x5a, 0x26, 0x73, 0xc9, 0x9b, 0x26, 0x79, 0x1d, 0xef, 0xd2, 0xca, 0xfd, 0xa6, + 0x9f, 0x8b, 0x7d, 0xfa, 0x82, 0x63, 0x68, 0xce, 0x66, 0x82, 0xf7, 0x2b, 0xbc, 0x2f, 0xee, 0x44, + 0xf8, 0xe0, 0x72, 0x91, 0x8b, 0x8f, 0x4c, 0x7c, 0x07, 0xdb, 0xd5, 0xf1, 0xbb, 0x2f, 0x4f, 0x26, + 0x51, 0x70, 0x3a, 0x89, 0x82, 0xbf, 0x93, 0x28, 0xf8, 0x3e, 0x8d, 0x6a, 0xa7, 0xd3, 0xa8, 0xf6, + 0x7b, 0x1a, 0xd5, 0xde, 0x91, 0x64, 0xa8, 0x0f, 0xf2, 0x3e, 0x19, 0xc8, 0x91, 0xef, 0xdd, 0x96, + 0x59, 0x32, 0xf3, 0x19, 0x3f, 0xa5, 0x9f, 0xac, 0x99, 0x3e, 0x4e, 0xb9, 0xea, 0x37, 0xcc, 0x3f, + 0xf5, 0xc9, 0x59, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0x47, 0xef, 0x62, 0x6b, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/schedule.pb.go b/x/cron/types/schedule.pb.go index 845a1059a..42fb227f7 100644 --- a/x/cron/types/schedule.pb.go +++ b/x/cron/types/schedule.pb.go @@ -247,29 +247,29 @@ var fileDescriptor_49ace1b59de613ef = []byte{ // 393 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xc1, 0xaa, 0xd3, 0x40, 0x18, 0x85, 0x33, 0x36, 0x2d, 0xed, 0xa8, 0xb5, 0x8e, 0x45, 0x42, 0xab, 0x69, 0x2c, 0x08, 0x41, - 0x30, 0x81, 0xea, 0xca, 0x9d, 0x89, 0x43, 0x5b, 0xd4, 0x16, 0xd2, 0x0a, 0xe2, 0x26, 0xa4, 0xe9, - 0x30, 0x09, 0x34, 0x99, 0x92, 0x99, 0x48, 0x7d, 0x0b, 0x1f, 0xab, 0xcb, 0x2e, 0x5d, 0x89, 0xb4, - 0x2b, 0xdf, 0xe2, 0x92, 0x49, 0x5a, 0x6e, 0xef, 0xdd, 0x84, 0x73, 0x38, 0xdf, 0xe1, 0x9f, 0xf9, - 0x33, 0xb0, 0x9f, 0x92, 0x5c, 0x64, 0x2c, 0xb5, 0xc3, 0xe2, 0xc3, 0xc3, 0x88, 0xac, 0xf3, 0x0d, - 0xb1, 0xb6, 0x19, 0x13, 0x0c, 0x3d, 0xaa, 0x42, 0xab, 0x08, 0x7b, 0x5d, 0xca, 0x28, 0x93, 0x81, - 0x5d, 0xa8, 0x92, 0x19, 0xfe, 0x07, 0xb0, 0xb9, 0xa8, 0x6a, 0x08, 0x41, 0x35, 0x0d, 0x12, 0xa2, - 0x01, 0x03, 0x98, 0x2d, 0x4f, 0x6a, 0xf4, 0x1c, 0x36, 0xb6, 0x24, 0x8b, 0xd9, 0x5a, 0x7b, 0x60, - 0x00, 0x53, 0xf5, 0x2a, 0x87, 0x3e, 0x40, 0x35, 0xe1, 0x94, 0x6b, 0x35, 0xa3, 0x66, 0x3e, 0x1c, - 0x19, 0xd6, 0xed, 0x59, 0xd6, 0x57, 0x4e, 0xf1, 0x8e, 0x84, 0xb9, 0x20, 0x2e, 0x4b, 0x45, 0x16, - 0x84, 0xc2, 0x51, 0xf7, 0x7f, 0x07, 0x8a, 0x27, 0x3b, 0xc8, 0x82, 0xcf, 0x36, 0x01, 0x17, 0x3e, - 0x29, 0x19, 0x3f, 0x22, 0x31, 0x8d, 0x84, 0xa6, 0xca, 0x01, 0x4f, 0x8b, 0xa8, 0x6a, 0x4f, 0x64, - 0x80, 0x30, 0x7c, 0x52, 0xa2, 0x31, 0x4b, 0x7d, 0x2e, 0x02, 0x4a, 0xb4, 0xba, 0x01, 0xcc, 0xf6, - 0xe8, 0xc5, 0xf5, 0x58, 0x7c, 0x86, 0x16, 0x05, 0xe3, 0xb5, 0xc9, 0x95, 0x1f, 0x3a, 0x10, 0xdd, - 0x3f, 0x18, 0xea, 0xc1, 0x66, 0x58, 0xe9, 0xea, 0xe2, 0x17, 0x8f, 0x3a, 0xb0, 0x96, 0x70, 0x2a, - 0x6f, 0xde, 0xf2, 0x0a, 0x39, 0x7c, 0x0d, 0x1f, 0x9f, 0xd7, 0xe5, 0xb2, 0x3c, 0x15, 0xa8, 0x0b, - 0xeb, 0x61, 0x21, 0x64, 0xb7, 0xee, 0x95, 0xe6, 0xcd, 0x12, 0xb6, 0xaf, 0x0f, 0x83, 0x06, 0xb0, - 0x8f, 0xbf, 0x63, 0xf7, 0xdb, 0x72, 0x3a, 0x9f, 0xf9, 0x8b, 0xe5, 0xc7, 0x31, 0xf6, 0xf1, 0xec, - 0x93, 0xef, 0x7c, 0x99, 0xbb, 0x9f, 0xb1, 0xd7, 0x51, 0xd0, 0x2b, 0xf8, 0xf2, 0x2e, 0xe0, 0xe0, - 0xf1, 0x74, 0x76, 0x41, 0x80, 0x33, 0xd9, 0x1f, 0x75, 0x70, 0x38, 0xea, 0xe0, 0xdf, 0x51, 0x07, - 0xbf, 0x4f, 0xba, 0x72, 0x38, 0xe9, 0xca, 0x9f, 0x93, 0xae, 0xfc, 0xb0, 0x68, 0x2c, 0xa2, 0x7c, - 0x65, 0x85, 0x2c, 0xb1, 0xab, 0x95, 0xbc, 0x65, 0x19, 0x3d, 0x6b, 0xfb, 0xe7, 0x7b, 0x7b, 0x57, - 0xbe, 0x11, 0xf1, 0x6b, 0x4b, 0xf8, 0xaa, 0x21, 0xff, 0xfe, 0xbb, 0x9b, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x2e, 0xa9, 0x20, 0xa0, 0x40, 0x02, 0x00, 0x00, + 0x30, 0x81, 0x8a, 0x1b, 0x77, 0x26, 0x0e, 0x6d, 0x51, 0x5b, 0x48, 0x2b, 0x88, 0x9b, 0x90, 0xa6, + 0xc3, 0x24, 0xd0, 0x64, 0x4a, 0x66, 0x22, 0xf5, 0x2d, 0x7c, 0xac, 0x2e, 0xbb, 0x74, 0x25, 0xd2, + 0xae, 0x7c, 0x8b, 0x4b, 0x26, 0x69, 0xb9, 0xbd, 0x77, 0x13, 0xce, 0xe1, 0x7c, 0x87, 0x7f, 0xe6, + 0xcf, 0xc0, 0x7e, 0x4a, 0x72, 0x91, 0xb1, 0xd4, 0x0e, 0x8b, 0x0f, 0x0f, 0x23, 0xb2, 0xce, 0x37, + 0xc4, 0xda, 0x66, 0x4c, 0x30, 0xf4, 0xa8, 0x0a, 0xad, 0x22, 0xec, 0x75, 0x29, 0xa3, 0x4c, 0x06, + 0x76, 0xa1, 0x4a, 0x66, 0xf8, 0x1f, 0xc0, 0xe6, 0xa2, 0xaa, 0x21, 0x04, 0xd5, 0x34, 0x48, 0x88, + 0x06, 0x0c, 0x60, 0xb6, 0x3c, 0xa9, 0xd1, 0x73, 0xd8, 0xd8, 0x92, 0x2c, 0x66, 0x6b, 0xed, 0x81, + 0x01, 0x4c, 0xd5, 0xab, 0x1c, 0xfa, 0x00, 0xd5, 0x84, 0x53, 0xae, 0xd5, 0x8c, 0x9a, 0xf9, 0x70, + 0x64, 0x58, 0xb7, 0x67, 0x59, 0x5f, 0x39, 0xc5, 0x3b, 0x12, 0xe6, 0x82, 0xb8, 0x2c, 0x15, 0x59, + 0x10, 0x0a, 0x47, 0xdd, 0xff, 0x1d, 0x28, 0x9e, 0xec, 0x20, 0x0b, 0x3e, 0xdb, 0x04, 0x5c, 0xf8, + 0xa4, 0x64, 0xfc, 0x88, 0xc4, 0x34, 0x12, 0x9a, 0x2a, 0x07, 0x3c, 0x2d, 0xa2, 0xaa, 0x3d, 0x91, + 0x01, 0xc2, 0xf0, 0x49, 0x89, 0xc6, 0x2c, 0xf5, 0xb9, 0x08, 0x28, 0xd1, 0xea, 0x06, 0x30, 0xdb, + 0xa3, 0x17, 0xd7, 0x63, 0xf1, 0x19, 0x5a, 0x14, 0x8c, 0xd7, 0x26, 0x57, 0x7e, 0xe8, 0x40, 0x74, + 0xff, 0x60, 0xa8, 0x07, 0x9b, 0x61, 0xa5, 0xab, 0x8b, 0x5f, 0x3c, 0xea, 0xc0, 0x5a, 0xc2, 0xa9, + 0xbc, 0x79, 0xcb, 0x2b, 0xe4, 0xf0, 0x35, 0x7c, 0x7c, 0x5e, 0x97, 0xcb, 0xf2, 0x54, 0xa0, 0x2e, + 0xac, 0x87, 0x85, 0x90, 0xdd, 0xba, 0x57, 0x9a, 0x37, 0x4b, 0xd8, 0xbe, 0x3e, 0x0c, 0x1a, 0xc0, + 0x3e, 0xfe, 0x8e, 0xdd, 0x6f, 0xcb, 0xe9, 0x7c, 0xe6, 0x2f, 0x96, 0x1f, 0xc7, 0xd8, 0xc7, 0xb3, + 0x4f, 0xbe, 0xf3, 0x65, 0xee, 0x7e, 0xc6, 0x5e, 0x47, 0x41, 0xaf, 0xe0, 0xcb, 0xbb, 0x80, 0x83, + 0xc7, 0xd3, 0xd9, 0x05, 0x01, 0xce, 0x64, 0x7f, 0xd4, 0xc1, 0xe1, 0xa8, 0x83, 0x7f, 0x47, 0x1d, + 0xfc, 0x3e, 0xe9, 0xca, 0xe1, 0xa4, 0x2b, 0x7f, 0x4e, 0xba, 0xf2, 0xc3, 0xa2, 0xb1, 0x88, 0xf2, + 0x95, 0x15, 0xb2, 0xc4, 0xae, 0x56, 0xf2, 0x96, 0x65, 0xf4, 0xac, 0xed, 0x9f, 0xef, 0xed, 0x5d, + 0xf9, 0x46, 0xc4, 0xaf, 0x2d, 0xe1, 0xab, 0x86, 0xfc, 0xfb, 0xef, 0x6e, 0x02, 0x00, 0x00, 0xff, + 0xff, 0xee, 0xcd, 0x08, 0xb7, 0x40, 0x02, 0x00, 0x00, } func (m *Schedule) Marshal() (dAtA []byte, err error) { diff --git a/x/cron/types/tx.pb.go b/x/cron/types/tx.pb.go index 141735a4e..c5ffb7299 100644 --- a/x/cron/types/tx.pb.go +++ b/x/cron/types/tx.pb.go @@ -355,7 +355,7 @@ var fileDescriptor_c9e0a673aba8d6fd = []byte{ // 554 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xbf, 0x6b, 0xdb, 0x40, 0x14, 0xf6, 0xd9, 0x8e, 0xc1, 0xe7, 0xe0, 0x10, 0xd5, 0x75, 0x64, 0x25, 0x55, 0x8c, 0x68, 0x1b, - 0xd7, 0x10, 0x89, 0xba, 0xa5, 0x05, 0x6f, 0x71, 0x31, 0x74, 0x11, 0xb4, 0x72, 0xbb, 0x64, 0x09, + 0xd7, 0x10, 0x89, 0xba, 0xb4, 0x05, 0x6f, 0x71, 0x31, 0x74, 0x11, 0xb4, 0x72, 0xbb, 0x64, 0x09, 0x8a, 0x74, 0x9c, 0x05, 0x95, 0x4e, 0xe8, 0x4e, 0xc6, 0xd9, 0x4a, 0xc7, 0x4c, 0xed, 0x5f, 0xd0, 0xb5, 0xd0, 0xc5, 0x43, 0xff, 0x88, 0x8c, 0xa1, 0x53, 0xa7, 0x52, 0xec, 0xc1, 0xff, 0x46, 0xd1, 0xaf, 0x44, 0x17, 0x41, 0x0a, 0x85, 0x2c, 0xa7, 0x7b, 0xef, 0xfb, 0xde, 0xd3, 0x77, 0xdf, 0x3d, @@ -387,7 +387,7 @@ var fileDescriptor_c9e0a673aba8d6fd = []byte{ 0x94, 0xc1, 0xe7, 0x95, 0x5c, 0xba, 0x5c, 0xc9, 0xa5, 0x5f, 0x2b, 0xb9, 0x74, 0xac, 0x62, 0x87, 0x4d, 0xc3, 0x53, 0xd5, 0x22, 0xae, 0x96, 0x76, 0x3c, 0x24, 0x01, 0xce, 0xf6, 0xda, 0xec, 0xb9, 0x36, 0x4f, 0x9f, 0xac, 0x33, 0x1f, 0xd1, 0xd3, 0x5a, 0xfc, 0x26, 0x3c, 0xfb, 0x1b, 0x00, 0x00, - 0xff, 0xff, 0xf7, 0xca, 0x79, 0x29, 0xcf, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x37, 0xae, 0x51, 0x3e, 0xcf, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cron/types/v1/schedule.pb.go b/x/cron/types/v1/schedule.pb.go index 3a35f34e6..a37932a39 100644 --- a/x/cron/types/v1/schedule.pb.go +++ b/x/cron/types/v1/schedule.pb.go @@ -209,24 +209,24 @@ var fileDescriptor_cd4938034d592826 = []byte{ // 316 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xc1, 0x4a, 0xc3, 0x30, 0x18, 0xc7, 0x1b, 0xd7, 0x8d, 0x2d, 0x22, 0x6a, 0x1c, 0x52, 0x76, 0x88, 0x63, 0x22, 0xec, 0x62, - 0x42, 0xd5, 0xab, 0x97, 0x0d, 0x41, 0x10, 0x2f, 0xf5, 0xe6, 0x65, 0x6c, 0x59, 0x48, 0x07, 0x6b, - 0x53, 0x9a, 0xb4, 0xcc, 0xb7, 0xf0, 0x25, 0x7c, 0x97, 0x1d, 0x77, 0xf4, 0x24, 0xd2, 0xbe, 0x88, - 0x24, 0xcd, 0x3c, 0xe8, 0x25, 0xfc, 0xfe, 0xfc, 0xbf, 0x7f, 0xbe, 0xef, 0x4b, 0x20, 0x4e, 0x79, - 0xa1, 0x73, 0x99, 0x52, 0x66, 0x8e, 0x32, 0xa4, 0x8a, 0xc5, 0x7c, 0x59, 0xac, 0x39, 0xc9, 0x72, - 0xa9, 0x25, 0x3a, 0x76, 0x3e, 0x31, 0x3e, 0x29, 0xc3, 0x41, 0x5f, 0x48, 0x21, 0xad, 0x47, 0x0d, - 0x35, 0x65, 0xa3, 0x0f, 0x00, 0xbb, 0x2f, 0x2e, 0x89, 0x10, 0xf4, 0xd3, 0x79, 0xc2, 0x03, 0x30, - 0x04, 0xe3, 0x5e, 0x64, 0x19, 0x9d, 0xc3, 0x4e, 0xc6, 0xf3, 0x95, 0x5c, 0x06, 0x07, 0x43, 0x30, - 0xf6, 0x23, 0xa7, 0xd0, 0x3d, 0xf4, 0x13, 0x25, 0x54, 0xd0, 0x1a, 0xb6, 0xc6, 0x87, 0x37, 0x97, - 0xe4, 0x4f, 0x3b, 0xf2, 0xac, 0xc4, 0xc3, 0x86, 0xb3, 0x42, 0xf3, 0xa9, 0x4c, 0x75, 0x3e, 0x67, - 0x7a, 0xe2, 0x6f, 0xbf, 0x2e, 0xbc, 0xc8, 0xc6, 0x10, 0x81, 0x67, 0xeb, 0xb9, 0xd2, 0x33, 0xde, - 0xd4, 0xcc, 0x62, 0xbe, 0x12, 0xb1, 0x0e, 0x7c, 0xdb, 0xe3, 0xd4, 0x58, 0x2e, 0xfd, 0x68, 0x8d, - 0xd1, 0x04, 0xa2, 0xff, 0x37, 0xa2, 0x01, 0xec, 0x32, 0xc7, 0x6e, 0xe8, 0x5f, 0x8d, 0x4e, 0x60, - 0x2b, 0x51, 0xc2, 0x4e, 0xdd, 0x8b, 0x0c, 0x8e, 0xae, 0xe0, 0xd1, 0x7e, 0xd5, 0xa9, 0x2c, 0x52, - 0x8d, 0xfa, 0xb0, 0xcd, 0x0c, 0xd8, 0x6c, 0x3b, 0x6a, 0xc4, 0xe4, 0x69, 0x5b, 0x61, 0xb0, 0xab, - 0x30, 0xf8, 0xae, 0x30, 0x78, 0xaf, 0xb1, 0xb7, 0xab, 0xb1, 0xf7, 0x59, 0x63, 0xef, 0x35, 0x14, - 0x2b, 0x1d, 0x17, 0x0b, 0xc2, 0x64, 0x42, 0xdd, 0xbe, 0xd7, 0x32, 0x17, 0x7b, 0xa6, 0xe5, 0x1d, - 0xdd, 0x34, 0xff, 0xa1, 0xdf, 0x32, 0xae, 0x68, 0x19, 0x2e, 0x3a, 0xf6, 0x99, 0x6f, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x4d, 0x2d, 0x47, 0x23, 0xaf, 0x01, 0x00, 0x00, + 0x42, 0x15, 0x8f, 0x5e, 0x36, 0x04, 0x41, 0xbc, 0xd4, 0x9b, 0x97, 0xb1, 0x65, 0x21, 0x1d, 0xac, + 0x4d, 0x69, 0xd2, 0x32, 0xdf, 0xc2, 0x97, 0xf0, 0x5d, 0x76, 0xdc, 0xd1, 0x93, 0x48, 0xfb, 0x22, + 0x92, 0x34, 0xf3, 0xa0, 0x97, 0xf0, 0xfb, 0xf3, 0xff, 0xfe, 0xf9, 0xbe, 0x2f, 0x81, 0x38, 0xe5, + 0x85, 0xce, 0x65, 0x4a, 0x99, 0x39, 0xca, 0x90, 0x2a, 0x16, 0xf3, 0x65, 0xb1, 0xe6, 0x24, 0xcb, + 0xa5, 0x96, 0xe8, 0xd8, 0xf9, 0xc4, 0xf8, 0xa4, 0x0c, 0x07, 0x7d, 0x21, 0x85, 0xb4, 0x1e, 0x35, + 0xd4, 0x94, 0x8d, 0x3e, 0x00, 0xec, 0xbe, 0xb8, 0x24, 0x42, 0xd0, 0x4f, 0xe7, 0x09, 0x0f, 0xc0, + 0x10, 0x8c, 0x7b, 0x91, 0x65, 0x74, 0x0e, 0x3b, 0x19, 0xcf, 0x57, 0x72, 0x19, 0x1c, 0x0c, 0xc1, + 0xd8, 0x8f, 0x9c, 0x42, 0xf7, 0xd0, 0x4f, 0x94, 0x50, 0x41, 0x6b, 0xd8, 0x1a, 0x1f, 0xde, 0x5c, + 0x92, 0x3f, 0xed, 0xc8, 0xb3, 0x12, 0x0f, 0x1b, 0xce, 0x0a, 0xcd, 0xa7, 0x32, 0xd5, 0xf9, 0x9c, + 0xe9, 0x89, 0xbf, 0xfd, 0xba, 0xf0, 0x22, 0x1b, 0x43, 0x04, 0x9e, 0xad, 0xe7, 0x4a, 0xcf, 0x78, + 0x53, 0x33, 0x8b, 0xf9, 0x4a, 0xc4, 0x3a, 0xf0, 0x6d, 0x8f, 0x53, 0x63, 0xb9, 0xf4, 0xa3, 0x35, + 0x46, 0x13, 0x88, 0xfe, 0xdf, 0x88, 0x06, 0xb0, 0xcb, 0x1c, 0xbb, 0xa1, 0x7f, 0x35, 0x3a, 0x81, + 0xad, 0x44, 0x09, 0x3b, 0x75, 0x2f, 0x32, 0x38, 0xba, 0x82, 0x47, 0xfb, 0x55, 0xa7, 0xb2, 0x48, + 0x35, 0xea, 0xc3, 0x36, 0x33, 0x60, 0xb3, 0xed, 0xa8, 0x11, 0x93, 0xa7, 0x6d, 0x85, 0xc1, 0xae, + 0xc2, 0xe0, 0xbb, 0xc2, 0xe0, 0xbd, 0xc6, 0xde, 0xae, 0xc6, 0xde, 0x67, 0x8d, 0xbd, 0xd7, 0x50, + 0xac, 0x74, 0x5c, 0x2c, 0x08, 0x93, 0x09, 0x75, 0xfb, 0x5e, 0xcb, 0x5c, 0xec, 0x99, 0x96, 0x77, + 0x74, 0xd3, 0xfc, 0x87, 0x7e, 0xcb, 0xb8, 0xa2, 0x65, 0xb8, 0xe8, 0xd8, 0x67, 0xbe, 0xfd, 0x09, + 0x00, 0x00, 0xff, 0xff, 0x43, 0xbd, 0xcc, 0x86, 0xaf, 0x01, 0x00, 0x00, } func (m *Schedule) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/client/cli/query.go b/x/dex/client/cli/query.go index b71cad5e4..aadd90629 100644 --- a/x/dex/client/cli/query.go +++ b/x/dex/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/dex/client/cli/query_inactive_limit_order_tranche.go b/x/dex/client/cli/query_inactive_limit_order_tranche.go index ccfc3fa70..a408fb76c 100644 --- a/x/dex/client/cli/query_inactive_limit_order_tranche.go +++ b/x/dex/client/cli/query_inactive_limit_order_tranche.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListInactiveLimitOrderTranche() *cobra.Command { diff --git a/x/dex/client/cli/query_limit_order_tranche.go b/x/dex/client/cli/query_limit_order_tranche.go index 79b6998ea..d297e6a9e 100644 --- a/x/dex/client/cli/query_limit_order_tranche.go +++ b/x/dex/client/cli/query_limit_order_tranche.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListLimitOrderTranche() *cobra.Command { diff --git a/x/dex/client/cli/query_limit_order_tranche_user.go b/x/dex/client/cli/query_limit_order_tranche_user.go index 14dec5263..baac20134 100644 --- a/x/dex/client/cli/query_limit_order_tranche_user.go +++ b/x/dex/client/cli/query_limit_order_tranche_user.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListLimitOrderTrancheUser() *cobra.Command { diff --git a/x/dex/client/cli/query_params.go b/x/dex/client/cli/query_params.go index 13397f53c..dd9911b4c 100644 --- a/x/dex/client/cli/query_params.go +++ b/x/dex/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/dex/client/cli/query_pool.go b/x/dex/client/cli/query_pool.go index 5d09944ce..1e5f0b035 100644 --- a/x/dex/client/cli/query_pool.go +++ b/x/dex/client/cli/query_pool.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdShowPool() *cobra.Command { diff --git a/x/dex/client/cli/query_pool_metadata.go b/x/dex/client/cli/query_pool_metadata.go index f7a79027d..dc7cceb2f 100644 --- a/x/dex/client/cli/query_pool_metadata.go +++ b/x/dex/client/cli/query_pool_metadata.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListPoolMetadata() *cobra.Command { diff --git a/x/dex/client/cli/query_pool_reserves.go b/x/dex/client/cli/query_pool_reserves.go index 608fd7985..c11e5dc2b 100644 --- a/x/dex/client/cli/query_pool_reserves.go +++ b/x/dex/client/cli/query_pool_reserves.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListPoolReserves() *cobra.Command { diff --git a/x/dex/client/cli/query_tick_liquidity.go b/x/dex/client/cli/query_tick_liquidity.go index 4b61177e8..2a1527fcc 100644 --- a/x/dex/client/cli/query_tick_liquidity.go +++ b/x/dex/client/cli/query_tick_liquidity.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListTickLiquidity() *cobra.Command { diff --git a/x/dex/client/cli/query_user_deposits.go b/x/dex/client/cli/query_user_deposits.go index 66fbf0ee5..3b7108e99 100644 --- a/x/dex/client/cli/query_user_deposits.go +++ b/x/dex/client/cli/query_user_deposits.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListUserDeposits() *cobra.Command { diff --git a/x/dex/client/cli/query_user_limit_orders.go b/x/dex/client/cli/query_user_limit_orders.go index 2026e743c..f5baac22f 100644 --- a/x/dex/client/cli/query_user_limit_orders.go +++ b/x/dex/client/cli/query_user_limit_orders.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdListUserLimitOrders() *cobra.Command { diff --git a/x/dex/client/cli/tx.go b/x/dex/client/cli/tx.go index 374c6b102..c9445af21 100644 --- a/x/dex/client/cli/tx.go +++ b/x/dex/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) diff --git a/x/dex/client/cli/tx_cancel_limit_order.go b/x/dex/client/cli/tx_cancel_limit_order.go index 8d73a5111..5bdb9ee91 100644 --- a/x/dex/client/cli/tx_cancel_limit_order.go +++ b/x/dex/client/cli/tx_cancel_limit_order.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdCancelLimitOrder() *cobra.Command { diff --git a/x/dex/client/cli/tx_deposit.go b/x/dex/client/cli/tx_deposit.go index 29ad39c36..dc0f3aeae 100644 --- a/x/dex/client/cli/tx_deposit.go +++ b/x/dex/client/cli/tx_deposit.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdDeposit() *cobra.Command { diff --git a/x/dex/client/cli/tx_multi_hop_swap.go b/x/dex/client/cli/tx_multi_hop_swap.go index a6d61c037..bc5b5ca70 100644 --- a/x/dex/client/cli/tx_multi_hop_swap.go +++ b/x/dex/client/cli/tx_multi_hop_swap.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) var _ = strconv.Itoa(0) diff --git a/x/dex/client/cli/tx_place_limit_order.go b/x/dex/client/cli/tx_place_limit_order.go index 8c4419dbd..2b59e8c76 100644 --- a/x/dex/client/cli/tx_place_limit_order.go +++ b/x/dex/client/cli/tx_place_limit_order.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdPlaceLimitOrder() *cobra.Command { diff --git a/x/dex/client/cli/tx_withdrawl.go b/x/dex/client/cli/tx_withdrawl.go index fd4247265..2be86cac3 100644 --- a/x/dex/client/cli/tx_withdrawl.go +++ b/x/dex/client/cli/tx_withdrawl.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdWithdrawal() *cobra.Command { diff --git a/x/dex/client/cli/tx_withdrawl_filled_limit_order.go b/x/dex/client/cli/tx_withdrawl_filled_limit_order.go index 0e947779a..80a6a7438 100644 --- a/x/dex/client/cli/tx_withdrawl_filled_limit_order.go +++ b/x/dex/client/cli/tx_withdrawl_filled_limit_order.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CmdWithdrawFilledLimitOrder() *cobra.Command { diff --git a/x/dex/genesis.go b/x/dex/genesis.go index 5e838a40a..06f984946 100644 --- a/x/dex/genesis.go +++ b/x/dex/genesis.go @@ -3,9 +3,9 @@ package dex import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/dex/genesis_test.go b/x/dex/genesis_test.go index ac944c274..ec0f48331 100644 --- a/x/dex/genesis_test.go +++ b/x/dex/genesis_test.go @@ -7,10 +7,10 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestGenesis(t *testing.T) { diff --git a/x/dex/keeper/cancel_limit_order.go b/x/dex/keeper/cancel_limit_order.go index a14d76833..5eb0e70dd 100644 --- a/x/dex/keeper/cancel_limit_order.go +++ b/x/dex/keeper/cancel_limit_order.go @@ -6,8 +6,8 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // CancelLimitOrderCore handles the logic for MsgCancelLimitOrder including bank operations and event emissions. @@ -15,12 +15,12 @@ func (k Keeper) CancelLimitOrderCore( goCtx context.Context, trancheKey string, callerAddr sdk.AccAddress, -) error { +) (makerCoinOut, takerCoinOut sdk.Coin, err error) { ctx := sdk.UnwrapSDKContext(goCtx) - makerCoinOut, takerCoinOut, tradePairID, err := k.ExecuteCancelLimitOrder(ctx, trancheKey, callerAddr) + makerCoinOut, takerCoinOut, err = k.ExecuteCancelLimitOrder(ctx, trancheKey, callerAddr) if err != nil { - return err + return sdk.Coin{}, sdk.Coin{}, err } coinsOut := sdk.NewCoins(makerCoinOut, takerCoinOut) @@ -31,23 +31,25 @@ func (k Keeper) CancelLimitOrderCore( coinsOut, ) if err != nil { - return err + return sdk.Coin{}, sdk.Coin{}, err } - // This will never panic since TradePairID has already been successfully constructed by ExecuteCancelLimitOrder - pairID := tradePairID.MustPairID() + makerDenom := makerCoinOut.Denom + takerDenom := takerCoinOut.Denom + // This will never panic since PairID has already been successfully constructed during tranche creation + pairID := types.MustNewPairID(makerDenom, takerDenom) ctx.EventManager().EmitEvent(types.CancelLimitOrderEvent( callerAddr, pairID.Token0, pairID.Token1, - tradePairID.MakerDenom, - tradePairID.TakerDenom, - makerCoinOut.Amount, + makerDenom, + takerDenom, takerCoinOut.Amount, + makerCoinOut.Amount, trancheKey, )) - return nil + return makerCoinOut, takerCoinOut, nil } // ExecuteCancelLimitOrder handles the core logic for CancelLimitOrder -- removing remaining TokenIn from the @@ -57,14 +59,14 @@ func (k Keeper) ExecuteCancelLimitOrder( ctx sdk.Context, trancheKey string, callerAddr sdk.AccAddress, -) (makerCoinOut, takerCoinOut sdk.Coin, tradePairID *types.TradePairID, error error) { +) (makerCoinOut, takerCoinOut sdk.Coin, error error) { trancheUser, found := k.GetLimitOrderTrancheUser(ctx, callerAddr.String(), trancheKey) if !found { - return sdk.Coin{}, sdk.Coin{}, nil, types.ErrActiveLimitOrderNotFound + return sdk.Coin{}, sdk.Coin{}, sdkerrors.Wrapf(types.ErrValidLimitOrderTrancheNotFound, "%s", trancheKey) } tradePairID, tickIndex := trancheUser.TradePairId, trancheUser.TickIndexTakerToMaker - tranche := k.GetLimitOrderTranche( + tranche, wasFilled, found := k.FindLimitOrderTranche( ctx, &types.LimitOrderTrancheKey{ TradePairId: tradePairID, @@ -72,8 +74,8 @@ func (k Keeper) ExecuteCancelLimitOrder( TrancheKey: trancheKey, }, ) - if tranche == nil { - return sdk.Coin{}, sdk.Coin{}, nil, types.ErrActiveLimitOrderNotFound + if !found { + return sdk.Coin{}, sdk.Coin{}, sdkerrors.Wrapf(types.ErrValidLimitOrderTrancheNotFound, "%s", trancheKey) } makerAmountToReturn := tranche.RemoveTokenIn(trancheUser) @@ -97,14 +99,18 @@ func (k Keeper) ExecuteCancelLimitOrder( trancheUser.SharesWithdrawn = trancheUser.SharesOwned if !makerAmountToReturn.IsPositive() && !takerAmountOut.IsPositive() { - return sdk.Coin{}, sdk.Coin{}, nil, sdkerrors.Wrapf(types.ErrCancelEmptyLimitOrder, "%s", tranche.Key.TrancheKey) + return sdk.Coin{}, sdk.Coin{}, sdkerrors.Wrapf(types.ErrCancelEmptyLimitOrder, "%s", tranche.Key.TrancheKey) } // This will ALWAYS result in a deletion of the TrancheUser, but we still use UpdateTranche user so that the relevant events will be emitted k.UpdateTrancheUser(ctx, trancheUser) - // If there is still liquidity from other shareholders we will either save the tranche as active or delete it entirely - k.UpdateTranche(ctx, tranche) + // If there is still liquidity from other shareholders we will either save the tranche as active/inactive or delete it entirely + if wasFilled { + k.UpdateInactiveTranche(ctx, tranche) + } else { + k.UpdateTranche(ctx, tranche) + } if trancheUser.OrderType.HasExpiration() { k.RemoveLimitOrderExpiration(ctx, *tranche.ExpirationTime, tranche.Key.KeyMarshal()) @@ -113,5 +119,5 @@ func (k Keeper) ExecuteCancelLimitOrder( makerCoinOut = sdk.NewCoin(tradePairID.MakerDenom, makerAmountToReturn) takerCoinOut = sdk.NewCoin(tradePairID.TakerDenom, takerAmountOut) - return makerCoinOut, takerCoinOut, tradePairID, nil + return makerCoinOut, takerCoinOut, nil } diff --git a/x/dex/keeper/core_helper.go b/x/dex/keeper/core_helper.go index e608f3c25..bcf72159e 100644 --- a/x/dex/keeper/core_helper.go +++ b/x/dex/keeper/core_helper.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "golang.org/x/exp/slices" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" - "github.com/neutron-org/neutron/v4/x/dex/utils" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/x/dex/keeper/core_helper_test.go b/x/dex/keeper/core_helper_test.go index 158198661..1c645006b 100644 --- a/x/dex/keeper/core_helper_test.go +++ b/x/dex/keeper/core_helper_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - neutronapp "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/x/dex/types" + neutronapp "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Test Suite /////////////////////////////////////////////////////////////// diff --git a/x/dex/keeper/deposit.go b/x/dex/keeper/deposit.go index f2bf60a2e..8a5058d6e 100644 --- a/x/dex/keeper/deposit.go +++ b/x/dex/keeper/deposit.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/utils" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/utils" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // DepositCore handles core logic for MsgDeposit including bank operations and event emissions diff --git a/x/dex/keeper/deposit_record.go b/x/dex/keeper/deposit_record.go index 24796fadd..9a0eee1a4 100644 --- a/x/dex/keeper/deposit_record.go +++ b/x/dex/keeper/deposit_record.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" - "github.com/neutron-org/neutron/v4/x/dex/utils" + "github.com/neutron-org/neutron/v5/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) func (k Keeper) GetAllDepositsForAddress(ctx sdk.Context, addr sdk.AccAddress) []*types.DepositRecord { diff --git a/x/dex/keeper/deposit_record_test.go b/x/dex/keeper/deposit_record_test.go index fe268244a..733b7659c 100644 --- a/x/dex/keeper/deposit_record_test.go +++ b/x/dex/keeper/deposit_record_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestGetAllDeposits() { diff --git a/x/dex/keeper/grpc_query.go b/x/dex/keeper/grpc_query.go index e0b9f7713..f7f73e428 100644 --- a/x/dex/keeper/grpc_query.go +++ b/x/dex/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go b/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go index eb133dce9..9816fdc40 100644 --- a/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go +++ b/x/dex/keeper/grpc_query_estimate_multi_hop_swap.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // TODO: This doesn't run ValidateBasic() checks. @@ -31,7 +31,7 @@ func (k Keeper) EstimateMultiHopSwap( callerAddr := sdk.MustAccAddressFromBech32(req.Creator) receiverAddr := sdk.MustAccAddressFromBech32(req.Receiver) - coinOut, err := k.MultiHopSwapCore( + coinOut, _, _, err := k.MultiHopSwapCore( cacheCtx, req.AmountIn, req.Routes, diff --git a/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go b/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go index 88312e2ef..aa3e18cfb 100644 --- a/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go +++ b/x/dex/keeper/grpc_query_estimate_multi_hop_swap_test.go @@ -4,8 +4,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestEstimateMultiHopSwapSingleRoute() { @@ -46,7 +46,7 @@ func (s *DexTestSuite) TestEstimateMultiHopSwapInsufficientLiquiditySingleRoute( // THEN estimate multihopswap fails route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} s.aliceEstimatesMultiHopSwapFails( - types.ErrLimitPriceNotSatisfied, + types.ErrNoLiquidity, route, 100, math_utils.MustNewPrecDecFromStr("0.9"), diff --git a/x/dex/keeper/grpc_query_estimate_place_limit_order.go b/x/dex/keeper/grpc_query_estimate_place_limit_order.go index 6a4447d0f..72927a477 100644 --- a/x/dex/keeper/grpc_query_estimate_place_limit_order.go +++ b/x/dex/keeper/grpc_query_estimate_place_limit_order.go @@ -6,7 +6,7 @@ import ( sdkerrors "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // TODO: This doesn't run ValidateBasic() checks. diff --git a/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go b/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go index 4dcf03c91..88f408abe 100644 --- a/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go +++ b/x/dex/keeper/grpc_query_inactive_limit_order_tranche.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) InactiveLimitOrderTrancheAll( diff --git a/x/dex/keeper/grpc_query_inactive_limit_order_tranche_test.go b/x/dex/keeper/grpc_query_inactive_limit_order_tranche_test.go index 51055eb65..d60d71d61 100644 --- a/x/dex/keeper/grpc_query_inactive_limit_order_tranche_test.go +++ b/x/dex/keeper/grpc_query_inactive_limit_order_tranche_test.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Prevent strconv unused error diff --git a/x/dex/keeper/grpc_query_limit_order_tranche.go b/x/dex/keeper/grpc_query_limit_order_tranche.go index c97dab766..f6dff5f3d 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Returns all ACTIVE limit order tranches for a given pairID/tokenIn combination diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_test.go b/x/dex/keeper/grpc_query_limit_order_tranche_test.go index 02ea87ec1..3ac15f4e2 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche_test.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche_test.go @@ -8,9 +8,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestLimitOrderTrancheQuerySingle(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_user.go b/x/dex/keeper/grpc_query_limit_order_tranche_user.go index beb75ad48..d378a8fab 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche_user.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche_user.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) LimitOrderTrancheUserAll( diff --git a/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go b/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go index 975052598..ed964cd7d 100644 --- a/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go +++ b/x/dex/keeper/grpc_query_limit_order_tranche_user_test.go @@ -10,10 +10,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/testutil/common/sample" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestLimitOrderTrancheUserQuerySingle(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_params.go b/x/dex/keeper/grpc_query_params.go index 46adad5b8..81267f35c 100644 --- a/x/dex/keeper/grpc_query_params.go +++ b/x/dex/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Returns dex params to the caller diff --git a/x/dex/keeper/grpc_query_params_test.go b/x/dex/keeper/grpc_query_params_test.go index 85caea3bd..d08543191 100644 --- a/x/dex/keeper/grpc_query_params_test.go +++ b/x/dex/keeper/grpc_query_params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_pool.go b/x/dex/keeper/grpc_query_pool.go index 2c4cff921..dffd10df2 100644 --- a/x/dex/keeper/grpc_query_pool.go +++ b/x/dex/keeper/grpc_query_pool.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Returns the pool that was requested by PairId, TickIndex and Fee (or errors) diff --git a/x/dex/keeper/grpc_query_pool_metadata.go b/x/dex/keeper/grpc_query_pool_metadata.go index b2bc94ab4..11546486d 100644 --- a/x/dex/keeper/grpc_query_pool_metadata.go +++ b/x/dex/keeper/grpc_query_pool_metadata.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) PoolMetadataAll(goCtx context.Context, req *types.QueryAllPoolMetadataRequest) (*types.QueryAllPoolMetadataResponse, error) { diff --git a/x/dex/keeper/grpc_query_pool_metadata_test.go b/x/dex/keeper/grpc_query_pool_metadata_test.go index d5b2d855d..56768b9cf 100644 --- a/x/dex/keeper/grpc_query_pool_metadata_test.go +++ b/x/dex/keeper/grpc_query_pool_metadata_test.go @@ -8,9 +8,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestPoolMetadataQuerySingle(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_pool_reserves.go b/x/dex/keeper/grpc_query_pool_reserves.go index c9c14d55e..e8b843417 100644 --- a/x/dex/keeper/grpc_query_pool_reserves.go +++ b/x/dex/keeper/grpc_query_pool_reserves.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) PoolReservesAll( diff --git a/x/dex/keeper/grpc_query_pool_reserves_test.go b/x/dex/keeper/grpc_query_pool_reserves_test.go index 9cf21356f..cf1350082 100644 --- a/x/dex/keeper/grpc_query_pool_reserves_test.go +++ b/x/dex/keeper/grpc_query_pool_reserves_test.go @@ -8,9 +8,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestPoolReservesQuerySingle(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_pool_test.go b/x/dex/keeper/grpc_query_pool_test.go index f154837aa..f32dc6e98 100644 --- a/x/dex/keeper/grpc_query_pool_test.go +++ b/x/dex/keeper/grpc_query_pool_test.go @@ -7,9 +7,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestPoolQuerySingle(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_simulate_cancel_limit_order.go b/x/dex/keeper/grpc_query_simulate_cancel_limit_order.go new file mode 100644 index 000000000..7cb529f0e --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_cancel_limit_order.go @@ -0,0 +1,40 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (k Keeper) SimulateCancelLimitOrder( + goCtx context.Context, + req *types.QuerySimulateCancelLimitOrderRequest, +) (*types.QuerySimulateCancelLimitOrderResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + + msg := req.Msg + + if err := msg.Validate(); err != nil { + return nil, err + } + + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + makerCoinOut, takerCoinOut, err := k.ExecuteCancelLimitOrder( + cacheCtx, + msg.TrancheKey, + callerAddr, + ) + if err != nil { + return nil, err + } + + return &types.QuerySimulateCancelLimitOrderResponse{ + Resp: &types.MsgCancelLimitOrderResponse{ + TakerCoinOut: takerCoinOut, + MakerCoinOut: makerCoinOut, + }, + }, nil +} diff --git a/x/dex/keeper/grpc_query_simulate_cancel_limit_order_test.go b/x/dex/keeper/grpc_query_simulate_cancel_limit_order_test.go new file mode 100644 index 000000000..0798f3ed3 --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_cancel_limit_order_test.go @@ -0,0 +1,52 @@ +package keeper_test + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (s *DexTestSuite) TestSimulateCancelLimitOrder() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(0, 20) + + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + + s.bobLimitSells("TokenB", -10, 20, types.LimitOrderType_FILL_OR_KILL) + + req := &types.QuerySimulateCancelLimitOrderRequest{ + Msg: &types.MsgCancelLimitOrder{ + Creator: s.alice.String(), + TrancheKey: trancheKey, + }, + } + + resp, err := s.App.DexKeeper.SimulateCancelLimitOrder(s.Ctx, req) + s.NoError(err) + + s.Equal(sdk.NewCoin("TokenB", math.NewInt(20_000_000)), resp.Resp.TakerCoinOut) + s.Equal(sdk.NewCoin("TokenA", math.NewInt(30_000_000)), resp.Resp.MakerCoinOut) + + s.assertDexBalances(30, 20) +} + +func (s *DexTestSuite) TestSimulateCancelLimitOrderFails() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(0, 60) + + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + + s.bobLimitSells("TokenB", -10, 60, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + req := &types.QuerySimulateCancelLimitOrderRequest{ + Msg: &types.MsgCancelLimitOrder{ + Creator: s.bob.String(), + TrancheKey: trancheKey, + }, + } + + resp, err := s.App.DexKeeper.SimulateCancelLimitOrder(s.Ctx, req) + s.ErrorIs(err, types.ErrValidLimitOrderTrancheNotFound) + s.Nil(resp) +} diff --git a/x/dex/keeper/grpc_query_simulate_deposit.go b/x/dex/keeper/grpc_query_simulate_deposit.go new file mode 100644 index 000000000..4b2eb0874 --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_deposit.go @@ -0,0 +1,62 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (k Keeper) SimulateDeposit( + goCtx context.Context, + req *types.QuerySimulateDepositRequest, +) (*types.QuerySimulateDepositResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + + msg := req.Msg + msg.Creator = types.DummyAddress + msg.Receiver = types.DummyAddress + + if err := msg.Validate(); err != nil { + return nil, err + } + + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + pairID, err := types.NewPairID(msg.TokenA, msg.TokenB) + if err != nil { + return nil, err + } + + // sort amounts + amounts0, amounts1 := SortAmounts(msg.TokenA, pairID.Token0, msg.AmountsA, msg.AmountsB) + + tickIndexes := NormalizeAllTickIndexes(msg.TokenA, pairID.Token0, msg.TickIndexesAToB) + + //nolint:dogsled + reserve0Deposited, reserve1Deposited, _, _, sharesIssued, _, failedDeposits, err := k.ExecuteDeposit( + cacheCtx, + pairID, + callerAddr, + receiverAddr, + amounts0, + amounts1, + tickIndexes, + msg.Fees, + msg.Options, + ) + if err != nil { + return nil, err + } + + return &types.QuerySimulateDepositResponse{ + Resp: &types.MsgDepositResponse{ + Reserve0Deposited: reserve0Deposited, + Reserve1Deposited: reserve1Deposited, + FailedDeposits: failedDeposits, + SharesIssued: sharesIssued, + }, + }, nil +} diff --git a/x/dex/keeper/grpc_query_simulate_deposit_test.go b/x/dex/keeper/grpc_query_simulate_deposit_test.go new file mode 100644 index 000000000..10000565f --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_deposit_test.go @@ -0,0 +1,78 @@ +package keeper_test + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (s *DexTestSuite) TestSimulateDeposit() { + req := &types.QuerySimulateDepositRequest{ + Msg: &types.MsgDeposit{ + TokenA: "TokenA", + TokenB: "TokenB", + AmountsA: []math.Int{math.OneInt(), math.OneInt()}, + AmountsB: []math.Int{math.ZeroInt(), math.ZeroInt()}, + TickIndexesAToB: []int64{0, 1}, + Fees: []uint64{1, 1}, + Options: []*types.DepositOptions{{}, {}}, + }, + } + resp, err := s.App.DexKeeper.SimulateDeposit(s.Ctx, req) + s.NoError(err) + s.Equal([]math.Int{math.OneInt(), math.OneInt()}, resp.Resp.Reserve0Deposited) + s.Equal([]math.Int{math.ZeroInt(), math.ZeroInt()}, resp.Resp.Reserve1Deposited) + + expectedShares := sdk.NewCoins( + sdk.NewCoin("neutron/pool/0", math.OneInt()), + sdk.NewCoin("neutron/pool/1", math.OneInt()), + ) + sharesIssued := sdk.NewCoins(resp.Resp.SharesIssued...) + s.True(sharesIssued.Equal(expectedShares)) + + s.assertDexBalances(0, 0) +} + +func (s *DexTestSuite) TestSimulateDepositPartialFailure() { + req := &types.QuerySimulateDepositRequest{ + Msg: &types.MsgDeposit{ + TokenA: "TokenA", + TokenB: "TokenB", + AmountsA: []math.Int{math.OneInt(), math.ZeroInt()}, + AmountsB: []math.Int{math.ZeroInt(), math.OneInt()}, + TickIndexesAToB: []int64{3, 0}, + Fees: []uint64{1, 1}, + Options: []*types.DepositOptions{{}, {}}, + }, + } + resp, err := s.App.DexKeeper.SimulateDeposit(s.Ctx, req) + s.NoError(err) + s.Equal(resp.Resp.Reserve0Deposited, []math.Int{math.OneInt(), math.ZeroInt()}) + s.Equal(resp.Resp.Reserve1Deposited, []math.Int{math.ZeroInt(), math.ZeroInt()}) + s.Equal(uint64(1), resp.Resp.FailedDeposits[0].DepositIdx) + s.Contains(resp.Resp.FailedDeposits[0].Error, types.ErrDepositBehindEnemyLines.Error()) + + expectedShares := sdk.NewCoins( + sdk.NewCoin("neutron/pool/0", math.OneInt()), + ) + sharesIssued := sdk.NewCoins(resp.Resp.SharesIssued...) + s.True(sharesIssued.Equal(expectedShares)) +} + +func (s *DexTestSuite) TestSimulateDepositFails() { + req := &types.QuerySimulateDepositRequest{ + Msg: &types.MsgDeposit{ + TokenA: "TokenA", + TokenB: "TokenB", + AmountsA: []math.Int{math.OneInt(), math.ZeroInt()}, + AmountsB: []math.Int{math.ZeroInt(), math.OneInt()}, + TickIndexesAToB: []int64{3, 0}, + Fees: []uint64{1, 1}, + Options: []*types.DepositOptions{{}, {FailTxOnBel: true}}, + }, + } + resp, err := s.App.DexKeeper.SimulateDeposit(s.Ctx, req) + s.Error(err, types.ErrDepositBehindEnemyLines) + s.Nil(resp) +} diff --git a/x/dex/keeper/grpc_query_simulate_multi_hop_swap.go b/x/dex/keeper/grpc_query_simulate_multi_hop_swap.go new file mode 100644 index 000000000..cf8e79cd7 --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_multi_hop_swap.go @@ -0,0 +1,44 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (k Keeper) SimulateMultiHopSwap( + goCtx context.Context, + req *types.QuerySimulateMultiHopSwapRequest, +) (*types.QuerySimulateMultiHopSwapResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + + msg := req.Msg + msg.Creator = types.DummyAddress + msg.Receiver = types.DummyAddress + + if err := msg.Validate(); err != nil { + return nil, err + } + + bestRoute, _, err := k.CalulateMultiHopSwap( + cacheCtx, + msg.AmountIn, + msg.Routes, + msg.ExitLimitPrice, + msg.PickBestRoute, + ) + if err != nil { + return nil, err + } + + return &types.QuerySimulateMultiHopSwapResponse{ + Resp: &types.MsgMultiHopSwapResponse{ + CoinOut: bestRoute.coinOut, + Dust: bestRoute.dust, + Route: &types.MultiHopRoute{Hops: bestRoute.route}, + }, + }, nil +} diff --git a/x/dex/keeper/grpc_query_simulate_multi_hop_swap_test.go b/x/dex/keeper/grpc_query_simulate_multi_hop_swap_test.go new file mode 100644 index 000000000..60aac43eb --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_multi_hop_swap_test.go @@ -0,0 +1,107 @@ +package keeper_test + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (s *DexTestSuite) TestSimulateMultiHopSwapSingleRoute() { + // GIVEN liquidity in pools A<>B, B<>C, C<>D, + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 0, 1), + ) + + // WHEN alice multihopswaps A<>B => B<>C => C<>D, + route := &types.MultiHopRoute{Hops: []string{"TokenA", "TokenB", "TokenC", "TokenD"}} + req := &types.QuerySimulateMultiHopSwapRequest{ + Msg: &types.MsgMultiHopSwap{ + Routes: []*types.MultiHopRoute{route}, + AmountIn: math.NewInt(100_000_000), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), + PickBestRoute: false, + }, + } + resp, err := s.App.DexKeeper.SimulateMultiHopSwap(s.Ctx, req) + s.NoError(err) + + // THEN alice would get out ~99 BIGTokenD + expectedOutCoin := sdk.NewCoin("TokenD", math.NewInt(99970003)) + s.Assert().True(resp.Resp.CoinOut.Equal(expectedOutCoin)) + s.Assert().Equal(route, resp.Resp.Route) + dust := sdk.NewCoins(resp.Resp.Dust...) + expectedDust := sdk.NewCoin("TokenA", math.OneInt()) + s.Assert().True(dust.Equal(sdk.NewCoins(expectedDust))) + + // Nothing changes on the dex + s.assertDexBalanceWithDenom("TokenA", 0) + s.assertDexBalanceWithDenom("TokenB", 100) + s.assertDexBalanceWithDenom("TokenC", 100) + s.assertDexBalanceWithDenom("TokenD", 100) +} + +func (s *DexTestSuite) TestSimulateMultiHopSwapMultiRoute() { + // GIVEN liquidity in pools A<>B, B<>C, C<>D, + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenD", 0, 150, -1000, 1), + ) + + // WHEN alice multihopswaps A<>B => B<>C => C<>D, + route1 := &types.MultiHopRoute{Hops: []string{"TokenA", "TokenB", "TokenC", "TokenD"}} + route2 := &types.MultiHopRoute{Hops: []string{"TokenA", "TokenB", "TokenD"}} + req := &types.QuerySimulateMultiHopSwapRequest{ + Msg: &types.MsgMultiHopSwap{ + Routes: []*types.MultiHopRoute{route1, route2}, + AmountIn: math.NewInt(100_000_000), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("0.9"), + PickBestRoute: true, + }, + } + resp, err := s.App.DexKeeper.SimulateMultiHopSwap(s.Ctx, req) + s.NoError(err) + + // THEN alice would get out ~110 BIGTokenD + expectedOutCoin := sdk.NewCoin("TokenD", math.NewInt(110494438)) + s.Assert().True(resp.Resp.CoinOut.Equal(expectedOutCoin)) + s.Assert().Equal(route2, resp.Resp.Route) + dust := sdk.NewCoins(resp.Resp.Dust...) + expectedDust := sdk.NewCoin("TokenA", math.OneInt()) + s.Assert().True(dust.Equal(sdk.NewCoins(expectedDust))) + + // Nothing changes on the dex + s.assertDexBalanceWithDenom("TokenA", 0) + s.assertDexBalanceWithDenom("TokenB", 100) + s.assertDexBalanceWithDenom("TokenC", 100) + s.assertDexBalanceWithDenom("TokenD", 250) +} + +func (s *DexTestSuite) TestSimulateMultiHopSwapFails() { + // GIVEN liquidity in pools A<>B, B<>C, C<>D, + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + NewPoolSetup("TokenB", "TokenC", 0, 100, 0, 1), + NewPoolSetup("TokenC", "TokenD", 0, 100, 0, 1), + ) + + // WHEN alice multihopswaps A<>B => B<>C => C<>D with a high limit price, + route := &types.MultiHopRoute{Hops: []string{"TokenA", "TokenB", "TokenC", "TokenD"}} + req := &types.QuerySimulateMultiHopSwapRequest{ + Msg: &types.MsgMultiHopSwap{ + Routes: []*types.MultiHopRoute{route}, + AmountIn: math.NewInt(100_000_000), + ExitLimitPrice: math_utils.MustNewPrecDecFromStr("2"), + PickBestRoute: false, + }, + } + // THEN her request fails + resp, err := s.App.DexKeeper.SimulateMultiHopSwap(s.Ctx, req) + s.Error(err, types.ErrLimitPriceNotSatisfied) + s.Nil(resp) +} diff --git a/x/dex/keeper/grpc_query_simulate_place_limit_order.go b/x/dex/keeper/grpc_query_simulate_place_limit_order.go new file mode 100644 index 000000000..2d863013d --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_place_limit_order.go @@ -0,0 +1,67 @@ +package keeper + +import ( + "context" + + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (k Keeper) SimulatePlaceLimitOrder( + goCtx context.Context, + req *types.QuerySimulatePlaceLimitOrderRequest, +) (*types.QuerySimulatePlaceLimitOrderResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + + msg := req.Msg + msg.Creator = types.DummyAddress + msg.Receiver = types.DummyAddress + + if err := msg.Validate(); err != nil { + return nil, err + } + + err := msg.ValidateGoodTilExpiration(ctx.BlockTime()) + if err != nil { + return nil, err + } + + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + takerTradePairID, err := types.NewTradePairID(msg.TokenIn, msg.TokenOut) + if err != nil { + return nil, err + } + tickIndex := msg.TickIndexInToOut + if msg.LimitSellPrice != nil { + tickIndex, err = types.CalcTickIndexFromPrice(*msg.LimitSellPrice) + if err != nil { + return nil, errors.Wrapf(err, "invalid LimitSellPrice %s", msg.LimitSellPrice.String()) + } + } + trancheKey, totalIn, takerCoinIn, takerCoinOut, _, err := k.ExecutePlaceLimitOrder( + cacheCtx, + takerTradePairID, + msg.AmountIn, + tickIndex, + msg.OrderType, + msg.ExpirationTime, + msg.MaxAmountOut, + receiverAddr, + ) + if err != nil { + return nil, err + } + + coinIn := sdk.NewCoin(msg.TokenIn, totalIn) + return &types.QuerySimulatePlaceLimitOrderResponse{ + Resp: &types.MsgPlaceLimitOrderResponse{ + TrancheKey: trancheKey, + CoinIn: coinIn, + TakerCoinIn: takerCoinIn, + TakerCoinOut: takerCoinOut, + }, + }, nil +} diff --git a/x/dex/keeper/grpc_query_simulate_place_limit_order_test.go b/x/dex/keeper/grpc_query_simulate_place_limit_order_test.go new file mode 100644 index 000000000..7e0600010 --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_place_limit_order_test.go @@ -0,0 +1,86 @@ +package keeper_test + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (s *DexTestSuite) TestSimulatePlaceLimitOrderWithTick() { + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + ) + + req := &types.QuerySimulatePlaceLimitOrderRequest{ + Msg: &types.MsgPlaceLimitOrder{ + TokenIn: "TokenA", + TokenOut: "TokenB", + TickIndexInToOut: 5, + AmountIn: math.NewInt(20_000_000), + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + } + + resp, err := s.App.DexKeeper.SimulatePlaceLimitOrder(s.Ctx, req) + s.NoError(err) + + s.Equal(sdk.NewCoin("TokenA", math.NewInt(20_000_000)), resp.Resp.CoinIn) + s.Equal(sdk.NewCoin("TokenA", math.NewInt(20_000_000)), resp.Resp.TakerCoinIn) + s.Equal(sdk.NewCoin("TokenB", math.NewInt(19_998_000)), resp.Resp.TakerCoinOut) + + s.assertDexBalances(0, 100) +} + +func (s *DexTestSuite) TestSimulatePlaceLimitOrderWithPrice() { + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 10, 0, 1), + NewPoolSetup("TokenA", "TokenB", 0, 10, 100, 1), + ) + + price := math_utils.MustNewPrecDecFromStr("0.995") + + req := &types.QuerySimulatePlaceLimitOrderRequest{ + Msg: &types.MsgPlaceLimitOrder{ + TokenIn: "TokenA", + TokenOut: "TokenB", + LimitSellPrice: &price, + AmountIn: math.NewInt(20_000_000), + OrderType: types.LimitOrderType_GOOD_TIL_CANCELLED, + }, + } + + resp, err := s.App.DexKeeper.SimulatePlaceLimitOrder(s.Ctx, req) + s.NoError(err) + + s.Equal(sdk.NewCoin("TokenA", math.NewInt(20_000_000)), resp.Resp.CoinIn) + s.Equal(sdk.NewCoin("TokenA", math.NewInt(10_001_000)), resp.Resp.TakerCoinIn) + s.Equal(sdk.NewCoin("TokenB", math.NewInt(10_000_000)), resp.Resp.TakerCoinOut) + + s.assertDexBalances(0, 20) +} + +func (s *DexTestSuite) TestSimulatePlaceLimitOrderFails() { + s.SetupMultiplePools( + NewPoolSetup("TokenA", "TokenB", 0, 100, 0, 1), + ) + + price := math_utils.MustNewPrecDecFromStr("1.1") + + req := &types.QuerySimulatePlaceLimitOrderRequest{ + Msg: &types.MsgPlaceLimitOrder{ + TokenIn: "TokenA", + TokenOut: "TokenB", + LimitSellPrice: &price, + AmountIn: math.NewInt(20_000_000), + OrderType: types.LimitOrderType_FILL_OR_KILL, + }, + } + + resp, err := s.App.DexKeeper.SimulatePlaceLimitOrder(s.Ctx, req) + s.ErrorIs(err, types.ErrFoKLimitOrderNotFilled) + s.Nil(resp) + + s.assertDexBalances(0, 100) +} diff --git a/x/dex/keeper/grpc_query_simulate_withdraw_filled_limit_order.go b/x/dex/keeper/grpc_query_simulate_withdraw_filled_limit_order.go new file mode 100644 index 000000000..6c074ef02 --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_withdraw_filled_limit_order.go @@ -0,0 +1,40 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (k Keeper) SimulateWithdrawFilledLimitOrder( + goCtx context.Context, + req *types.QuerySimulateWithdrawFilledLimitOrderRequest, +) (*types.QuerySimulateWithdrawFilledLimitOrderResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + + msg := req.Msg + + if err := msg.Validate(); err != nil { + return nil, err + } + + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + takerCoinOut, makerCoinOut, err := k.ExecuteWithdrawFilledLimitOrder( + cacheCtx, + msg.TrancheKey, + callerAddr, + ) + if err != nil { + return nil, err + } + + return &types.QuerySimulateWithdrawFilledLimitOrderResponse{ + Resp: &types.MsgWithdrawFilledLimitOrderResponse{ + TakerCoinOut: takerCoinOut, + MakerCoinOut: makerCoinOut, + }, + }, nil +} diff --git a/x/dex/keeper/grpc_query_simulate_withdraw_filled_limit_order_test.go b/x/dex/keeper/grpc_query_simulate_withdraw_filled_limit_order_test.go new file mode 100644 index 000000000..0b241842e --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_withdraw_filled_limit_order_test.go @@ -0,0 +1,52 @@ +package keeper_test + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (s *DexTestSuite) TestSimulateWithdrawFilledLimitOrder() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(0, 20) + + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + + s.bobLimitSells("TokenB", -10, 20, types.LimitOrderType_FILL_OR_KILL) + + req := &types.QuerySimulateWithdrawFilledLimitOrderRequest{ + Msg: &types.MsgWithdrawFilledLimitOrder{ + Creator: s.alice.String(), + TrancheKey: trancheKey, + }, + } + + resp, err := s.App.DexKeeper.SimulateWithdrawFilledLimitOrder(s.Ctx, req) + s.NoError(err) + + s.Equal(sdk.NewCoin("TokenB", math.NewInt(20_000_000)), resp.Resp.TakerCoinOut) + s.Equal(sdk.NewCoin("TokenA", math.ZeroInt()), resp.Resp.MakerCoinOut) + + s.assertDexBalances(30, 20) +} + +func (s *DexTestSuite) TestSimulateWithdrawFilledLimitOrderFails() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(0, 20) + + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + + s.bobLimitSells("TokenB", -10, 20, types.LimitOrderType_FILL_OR_KILL) + + req := &types.QuerySimulateWithdrawFilledLimitOrderRequest{ + Msg: &types.MsgWithdrawFilledLimitOrder{ + Creator: s.bob.String(), + TrancheKey: trancheKey, + }, + } + + resp, err := s.App.DexKeeper.SimulateWithdrawFilledLimitOrder(s.Ctx, req) + s.ErrorIs(err, types.ErrValidLimitOrderTrancheNotFound) + s.Nil(resp) +} diff --git a/x/dex/keeper/grpc_query_simulate_withdrawal.go b/x/dex/keeper/grpc_query_simulate_withdrawal.go new file mode 100644 index 000000000..40e27f6e0 --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_withdrawal.go @@ -0,0 +1,53 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (k Keeper) SimulateWithdrawal( + goCtx context.Context, + req *types.QuerySimulateWithdrawalRequest, +) (*types.QuerySimulateWithdrawalResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + cacheCtx, _ := ctx.CacheContext() + + msg := req.Msg + + if err := msg.Validate(); err != nil { + return nil, err + } + + callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) + receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) + pairID, err := types.NewPairID(msg.TokenA, msg.TokenB) + if err != nil { + return nil, err + } + + tickIndexes := NormalizeAllTickIndexes(msg.TokenA, pairID.Token0, msg.TickIndexesAToB) + + reserve0Withdrawn, reserve1Withdrawn, sharesBurned, _, err := k.ExecuteWithdraw( + cacheCtx, + pairID, + callerAddr, + receiverAddr, + msg.SharesToRemove, + tickIndexes, + msg.Fees, + ) + if err != nil { + return nil, err + } + + return &types.QuerySimulateWithdrawalResponse{ + Resp: &types.MsgWithdrawalResponse{ + Reserve0Withdrawn: reserve0Withdrawn, + Reserve1Withdrawn: reserve1Withdrawn, + SharesBurned: sharesBurned, + }, + }, nil +} diff --git a/x/dex/keeper/grpc_query_simulate_withdrawal_test.go b/x/dex/keeper/grpc_query_simulate_withdrawal_test.go new file mode 100644 index 000000000..52c44143c --- /dev/null +++ b/x/dex/keeper/grpc_query_simulate_withdrawal_test.go @@ -0,0 +1,63 @@ +package keeper_test + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/dex/types" +) + +func (s *DexTestSuite) TestSimulateWithdrawal() { + s.fundAliceBalances(20, 0) + + s.aliceDeposits(NewDeposit(10, 0, 0, 1), NewDeposit(10, 0, 1, 1)) + + req := &types.QuerySimulateWithdrawalRequest{ + Msg: &types.MsgWithdrawal{ + Creator: s.alice.String(), + Receiver: s.alice.String(), + TokenA: "TokenA", + TokenB: "TokenB", + SharesToRemove: []math.Int{math.NewInt(5), math.NewInt(9)}, + TickIndexesAToB: []int64{0, 1}, + Fees: []uint64{1, 1}, + }, + } + resp, err := s.App.DexKeeper.SimulateWithdrawal(s.Ctx, req) + s.NoError(err) + + s.Equal(math.NewInt(14), resp.Resp.Reserve0Withdrawn) + s.Equal(math.ZeroInt(), resp.Resp.Reserve1Withdrawn) + + expectedSharesBurned := sdk.NewCoins( + sdk.NewCoin("neutron/pool/0", math.NewInt(5)), + sdk.NewCoin("neutron/pool/1", math.NewInt(9)), + ) + sharesBurned := sdk.NewCoins(resp.Resp.SharesBurned...) + s.True(sharesBurned.Equal(expectedSharesBurned)) + + // Dex Balances Unchanged + + s.assertDexBalances(20, 0) +} + +func (s *DexTestSuite) TestSimulateWithdrawalFails() { + s.fundAliceBalances(20, 0) + + s.aliceDeposits(NewDeposit(10, 0, 0, 1), NewDeposit(10, 0, 1, 1)) + + req := &types.QuerySimulateWithdrawalRequest{ + Msg: &types.MsgWithdrawal{ + Creator: s.alice.String(), + Receiver: s.alice.String(), + TokenA: "TokenA", + TokenB: "TokenB", + SharesToRemove: []math.Int{math.NewInt(5), math.NewInt(200_000_000)}, + TickIndexesAToB: []int64{0, 1}, + Fees: []uint64{1, 1}, + }, + } + resp, err := s.App.DexKeeper.SimulateWithdrawal(s.Ctx, req) + s.Error(err, types.ErrInsufficientShares) + s.Nil(resp) +} diff --git a/x/dex/keeper/grpc_query_tick_liquidity.go b/x/dex/keeper/grpc_query_tick_liquidity.go index 37622ccdf..bec800114 100644 --- a/x/dex/keeper/grpc_query_tick_liquidity.go +++ b/x/dex/keeper/grpc_query_tick_liquidity.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // NOTE: For single queries of tick liquidity use explicty typed queries diff --git a/x/dex/keeper/grpc_query_tick_liquidity_test.go b/x/dex/keeper/grpc_query_tick_liquidity_test.go index 42bb71eb1..8e8982dc9 100644 --- a/x/dex/keeper/grpc_query_tick_liquidity_test.go +++ b/x/dex/keeper/grpc_query_tick_liquidity_test.go @@ -8,8 +8,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestTickLiquidityQueryPaginated(t *testing.T) { diff --git a/x/dex/keeper/grpc_query_user_deposits.go b/x/dex/keeper/grpc_query_user_deposits.go index f941278e3..6dcb83b8b 100644 --- a/x/dex/keeper/grpc_query_user_deposits.go +++ b/x/dex/keeper/grpc_query_user_deposits.go @@ -7,9 +7,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/utils" - "github.com/neutron-org/neutron/v4/x/dex/types" - dexutils "github.com/neutron-org/neutron/v4/x/dex/utils" + "github.com/neutron-org/neutron/v5/utils" + "github.com/neutron-org/neutron/v5/x/dex/types" + dexutils "github.com/neutron-org/neutron/v5/x/dex/utils" ) func (k Keeper) UserDepositsAll( diff --git a/x/dex/keeper/grpc_query_user_deposits_test.go b/x/dex/keeper/grpc_query_user_deposits_test.go index f29bb3c62..e9c6a8f73 100644 --- a/x/dex/keeper/grpc_query_user_deposits_test.go +++ b/x/dex/keeper/grpc_query_user_deposits_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - neutronapp "github.com/neutron-org/neutron/v4/app" - "github.com/neutron-org/neutron/v4/testutil" - keepertest "github.com/neutron-org/neutron/v4/x/dex/keeper/internal/testutils" - "github.com/neutron-org/neutron/v4/x/dex/types" + neutronapp "github.com/neutron-org/neutron/v5/app" + "github.com/neutron-org/neutron/v5/testutil" + keepertest "github.com/neutron-org/neutron/v5/x/dex/keeper/internal/testutils" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func simulateDeposit(ctx sdk.Context, app *neutronapp.App, addr sdk.AccAddress, deposit *types.DepositRecord) *types.Pool { diff --git a/x/dex/keeper/inactive_limit_order_tranche.go b/x/dex/keeper/inactive_limit_order_tranche.go index b629a4f8a..a8d5115d5 100644 --- a/x/dex/keeper/inactive_limit_order_tranche.go +++ b/x/dex/keeper/inactive_limit_order_tranche.go @@ -5,7 +5,7 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // SetInactiveLimitOrderTranche set a specific inactiveLimitOrderTranche in the store from its index diff --git a/x/dex/keeper/inactive_limit_order_tranche_test.go b/x/dex/keeper/inactive_limit_order_tranche_test.go index fbba221f1..2c86871a3 100644 --- a/x/dex/keeper/inactive_limit_order_tranche_test.go +++ b/x/dex/keeper/inactive_limit_order_tranche_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func createNInactiveLimitOrderTranche( diff --git a/x/dex/keeper/integration_cancellimitorder_test.go b/x/dex/keeper/integration_cancellimitorder_test.go index ebb960f02..75b2fac56 100644 --- a/x/dex/keeper/integration_cancellimitorder_test.go +++ b/x/dex/keeper/integration_cancellimitorder_test.go @@ -6,7 +6,7 @@ import ( sdkmath "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestCancelEntireLimitOrderAOneExists() { @@ -185,7 +185,7 @@ func (s *DexTestSuite) TestCancelTwiceFails() { s.assertAliceBalances(50, 50) s.assertDexBalances(0, 0) - s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) + s.aliceCancelsLimitSellFails(trancheKey, types.ErrValidLimitOrderTrancheNotFound) } func (s *DexTestSuite) TestCancelPartiallyFilled() { @@ -212,6 +212,24 @@ func (s *DexTestSuite) TestCancelPartiallyFilled() { s.Assert().False(found) } +func (s *DexTestSuite) TestCancelWithdrawThenCancel() { + s.fundAliceBalances(10, 0) + s.fundBobBalances(0, 20) + + // GIVEN alice limit sells 10 TokenA + trancheKey := s.aliceLimitSells("TokenA", -6931, 10) + // Bob swaps some TokenB for 5 TokenA + s.bobLimitSellsWithMaxOut("TokenB", 7000, 20, 5) + + // WHEN alice withdraws + s.aliceWithdrawsLimitSell(trancheKey) + s.assertAliceBalancesInt(sdkmath.ZeroInt(), sdkmath.NewInt(9999181)) + + // THEN Alice cancel still works + s.aliceCancelsLimitSell(trancheKey) + s.assertAliceBalancesInt(sdkmath.NewInt(4999999), sdkmath.NewInt(9999181)) +} + func (s *DexTestSuite) TestCancelPartiallyFilledWithdrawFails() { s.fundAliceBalances(50, 0) s.fundBobBalances(0, 10) @@ -335,6 +353,43 @@ func (s *DexTestSuite) TestCancelFirstMultiWithdraw() { s.assertAliceBalances(0, 10) } +func (s *DexTestSuite) TestCancelMultiAfterFilled() { + s.fundAliceBalances(50, 0) + s.fundBobBalances(50, 0) + s.fundCarolBalances(0, 100) + + // GIVEN alice and bob each limit sells 50 TokenA + trancheKey := s.aliceLimitSells("TokenA", 0, 50) + s.bobLimitSells("TokenA", 0, 50) + + // carol swaps through the tranche + s.carolLimitSells("TokenB", -1, 100, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + + // WHEN alice and bob cancel their limit order + s.aliceCancelsLimitSell(trancheKey) + s.assertAliceBalances(0, 50) + s.bobCancelsLimitSell(trancheKey) + s.assertBobBalances(0, 50) + + // THEN they get back the expected profit + s.assertAliceBalances(0, 50) + s.assertBobBalances(0, 50) + + // AND tranche and trancheUsers are deleted + + s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) + _, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ + TradePairId: types.MustNewTradePairID("TokenB", "TokenA"), + TickIndexTakerToMaker: 0, + TrancheKey: trancheKey, + }) + s.False(found) + _, found = s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) + s.Assert().False(found) + _, found = s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.carol.String(), trancheKey) + s.Assert().False(found) +} + func (s *DexTestSuite) TestCancelGoodTil() { s.fundAliceBalances(50, 0) tomorrow := time.Now().AddDate(0, 0, 1) @@ -351,7 +406,7 @@ func (s *DexTestSuite) TestCancelGoodTil() { s.assertNLimitOrderExpiration(0) } -func (s *DexTestSuite) TestCancelGoodTilAfterExpirationFails() { +func (s *DexTestSuite) TestCancelGoodTilAfterExpiration() { s.fundAliceBalances(50, 0) tomorrow := time.Now().AddDate(0, 0, 1) // GIVEN alice limit sells 50 TokenA with goodTil date of tommrow @@ -362,8 +417,19 @@ func (s *DexTestSuite) TestCancelGoodTilAfterExpirationFails() { // WHEN expiration date has passed s.beginBlockWithTime(time.Now().AddDate(0, 0, 2)) - // THEN alice cancellation fails - s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) + // THEN alice cancellation succeeds + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 0) + + // TrancheUser and Tranche are removed + s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) + _, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ + TradePairId: types.MustNewTradePairID("TokenB", "TokenA"), + TickIndexTakerToMaker: 0, + TrancheKey: trancheKey, + }) + s.False(found) } func (s *DexTestSuite) TestCancelJITSameBlock() { @@ -392,9 +458,19 @@ func (s *DexTestSuite) TestCancelJITNextBlock() { s.nextBlockWithTime(time.Now()) s.beginBlockWithTime(time.Now()) - // THEN alice cancellation fails - s.aliceCancelsLimitSellFails(trancheKey, types.ErrActiveLimitOrderNotFound) - s.assertAliceBalances(0, 0) + // THEN alice cancellation succeeds + s.aliceCancelsLimitSell(trancheKey) + + s.assertAliceBalances(50, 0) + + // TrancheUser and Tranche are removed + s.App.DexKeeper.GetLimitOrderTrancheUser(s.Ctx, s.alice.String(), trancheKey) + _, _, found := s.App.DexKeeper.FindLimitOrderTranche(s.Ctx, &types.LimitOrderTrancheKey{ + TradePairId: types.MustNewTradePairID("TokenB", "TokenA"), + TickIndexTakerToMaker: 0, + TrancheKey: trancheKey, + }) + s.False(found) } func (s *DexTestSuite) TestWithdrawThenCancel() { diff --git a/x/dex/keeper/integration_deposit_autoswap_unit_test.go b/x/dex/keeper/integration_deposit_autoswap_unit_test.go index 5e0b68773..1e6dc438f 100644 --- a/x/dex/keeper/integration_deposit_autoswap_unit_test.go +++ b/x/dex/keeper/integration_deposit_autoswap_unit_test.go @@ -1,6 +1,6 @@ package keeper_test -import "github.com/neutron-org/neutron/v4/x/dex/types" +import "github.com/neutron-org/neutron/v5/x/dex/types" func (s *DexTestSuite) TestAutoswapperWithdraws() { s.fundAliceBalances(50, 50) diff --git a/x/dex/keeper/integration_deposit_doublesided_test.go b/x/dex/keeper/integration_deposit_doublesided_test.go index 3f54f9c16..57f9a2e0c 100644 --- a/x/dex/keeper/integration_deposit_doublesided_test.go +++ b/x/dex/keeper/integration_deposit_doublesided_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestDepositDoubleSidedInSpreadCurrTickAdjusted() { diff --git a/x/dex/keeper/integration_deposit_multi_test.go b/x/dex/keeper/integration_deposit_multi_test.go index a9a72c906..a33a6064d 100644 --- a/x/dex/keeper/integration_deposit_multi_test.go +++ b/x/dex/keeper/integration_deposit_multi_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestDepositMultiCompleteFailure() { diff --git a/x/dex/keeper/integration_deposit_singlesided_test.go b/x/dex/keeper/integration_deposit_singlesided_test.go index 5edcbf01a..71e3847c8 100644 --- a/x/dex/keeper/integration_deposit_singlesided_test.go +++ b/x/dex/keeper/integration_deposit_singlesided_test.go @@ -5,7 +5,7 @@ import ( sdkmath "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestDepositSingleSidedInSpread1To0() { diff --git a/x/dex/keeper/integration_multihopswap_test.go b/x/dex/keeper/integration_multihopswap_test.go index 29ffdc6f0..0ca12fa6c 100644 --- a/x/dex/keeper/integration_multihopswap_test.go +++ b/x/dex/keeper/integration_multihopswap_test.go @@ -4,8 +4,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type PoolSetup struct { @@ -195,7 +195,7 @@ func (s *DexTestSuite) TestMultiHopSwapInsufficientLiquiditySingleRoute() { // THEN alice multihopswap fails route := [][]string{{"TokenA", "TokenB", "TokenC", "TokenD"}} s.aliceMultiHopSwapFails( - types.ErrLimitPriceNotSatisfied, + types.ErrNoLiquidity, route, 100, math_utils.MustNewPrecDecFromStr("0.9"), diff --git a/x/dex/keeper/integration_placelimitorder_test.go b/x/dex/keeper/integration_placelimitorder_test.go index 37c822973..27afad48a 100644 --- a/x/dex/keeper/integration_placelimitorder_test.go +++ b/x/dex/keeper/integration_placelimitorder_test.go @@ -7,8 +7,8 @@ import ( sdkmath "cosmossdk.io/math" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Core tests w/ GTC limitOrders ////////////////////////////////////////////// @@ -528,7 +528,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderIoCNoLiq() { s.fundAliceBalances(10, 0) // GIVEN no liquidity // Thenalice IoC limitOrder fails - s.assertAliceLimitSellFails(types.ErrLimitPriceNotSatisfied, "TokenA", 0, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + s.assertAliceLimitSellFails(types.ErrNoLiquidity, "TokenA", 0, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) } func (s *DexTestSuite) TestPlaceLimitOrderIoCWithLPFills() { @@ -571,7 +571,7 @@ func (s *DexTestSuite) TestPlaceLimitOrderIoCWithLPNoFill() { // GIVEN LP of 5 tokenB at tick -1 s.bobDeposits(NewDeposit(0, 5, -1, 1)) // THEN alice IoC limitOrder for 10 tokenA below current 0To1 price fails - s.assertAliceLimitSellFails(types.ErrLimitPriceNotSatisfied, "TokenA", -1, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) + s.assertAliceLimitSellFails(types.ErrNoLiquidity, "TokenA", -1, 10, types.LimitOrderType_IMMEDIATE_OR_CANCEL) } func (s *DexTestSuite) TestPlaceLimitOrderIoCTooSmallFails() { diff --git a/x/dex/keeper/integration_withdraw_multi_test.go b/x/dex/keeper/integration_withdraw_multi_test.go index 8dca0ba28..8857fa366 100644 --- a/x/dex/keeper/integration_withdraw_multi_test.go +++ b/x/dex/keeper/integration_withdraw_multi_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestWithdrawMultiFailure() { diff --git a/x/dex/keeper/integration_withdraw_test.go b/x/dex/keeper/integration_withdraw_test.go index fa146e61a..d9e5292c2 100644 --- a/x/dex/keeper/integration_withdraw_test.go +++ b/x/dex/keeper/integration_withdraw_test.go @@ -5,7 +5,7 @@ import ( sdkmath "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestPartialWithdrawOnlyA() { diff --git a/x/dex/keeper/integration_withdrawfilled_test.go b/x/dex/keeper/integration_withdrawfilled_test.go index 97df676c0..26e111875 100644 --- a/x/dex/keeper/integration_withdrawfilled_test.go +++ b/x/dex/keeper/integration_withdrawfilled_test.go @@ -6,7 +6,7 @@ import ( sdkmath "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (s *DexTestSuite) TestWithdrawFilledSimpleFull() { diff --git a/x/dex/keeper/internal/testutils/test_helpers.go b/x/dex/keeper/internal/testutils/test_helpers.go index 4af8ec773..e1ea65424 100644 --- a/x/dex/keeper/internal/testutils/test_helpers.go +++ b/x/dex/keeper/internal/testutils/test_helpers.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - dexmoduletypes "github.com/neutron-org/neutron/v4/x/dex/types" + dexmoduletypes "github.com/neutron-org/neutron/v5/x/dex/types" ) func NewACoin(amt math.Int) sdk.Coin { diff --git a/x/dex/keeper/keeper.go b/x/dex/keeper/keeper.go index 797b74d48..e2c5b7f98 100644 --- a/x/dex/keeper/keeper.go +++ b/x/dex/keeper/keeper.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type ( diff --git a/x/dex/keeper/limit_order_expiration.go b/x/dex/keeper/limit_order_expiration.go index f9127a38f..58b6584c8 100644 --- a/x/dex/keeper/limit_order_expiration.go +++ b/x/dex/keeper/limit_order_expiration.go @@ -7,7 +7,7 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Creates a new LimitOrderExpiration struct based on a LimitOrderTranche diff --git a/x/dex/keeper/limit_order_expiration_test.go b/x/dex/keeper/limit_order_expiration_test.go index acfb468ad..8dadf9ee9 100644 --- a/x/dex/keeper/limit_order_expiration_test.go +++ b/x/dex/keeper/limit_order_expiration_test.go @@ -9,8 +9,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) const gasRequiredToPurgeOneLO uint64 = 9_000 diff --git a/x/dex/keeper/limit_order_tranche.go b/x/dex/keeper/limit_order_tranche.go index f56ed83aa..68078abfa 100644 --- a/x/dex/keeper/limit_order_tranche.go +++ b/x/dex/keeper/limit_order_tranche.go @@ -10,8 +10,8 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" - "github.com/neutron-org/neutron/v4/x/dex/utils" + "github.com/neutron-org/neutron/v5/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) func NewLimitOrderTranche( diff --git a/x/dex/keeper/limit_order_tranche_test.go b/x/dex/keeper/limit_order_tranche_test.go index 3c44f3822..35d69d394 100644 --- a/x/dex/keeper/limit_order_tranche_test.go +++ b/x/dex/keeper/limit_order_tranche_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func createNLimitOrderTranches( diff --git a/x/dex/keeper/limit_order_tranche_user.go b/x/dex/keeper/limit_order_tranche_user.go index 8e8e600c1..b08f460ca 100644 --- a/x/dex/keeper/limit_order_tranche_user.go +++ b/x/dex/keeper/limit_order_tranche_user.go @@ -6,7 +6,7 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) GetOrInitLimitOrderTrancheUser( @@ -98,6 +98,7 @@ func (k Keeper) UpdateTrancheUser(ctx sdk.Context, trancheUser *types.LimitOrder // The trancheUser has withdrawable shares; it should be saved k.SetLimitOrderTrancheUser(ctx, trancheUser) } + ctx.EventManager().EmitEvent(types.TrancheUserUpdateEvent(*trancheUser)) } // GetAllLimitOrderTrancheUser returns all LimitOrderTrancheUser diff --git a/x/dex/keeper/limit_order_tranche_user_test.go b/x/dex/keeper/limit_order_tranche_user_test.go index a5578ee43..cfde55729 100644 --- a/x/dex/keeper/limit_order_tranche_user_test.go +++ b/x/dex/keeper/limit_order_tranche_user_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func createNLimitOrderTrancheUser(keeper *keeper.Keeper, ctx sdk.Context, n int) []*types.LimitOrderTrancheUser { diff --git a/x/dex/keeper/liquidity.go b/x/dex/keeper/liquidity.go index 31dbfd14e..b1284f520 100644 --- a/x/dex/keeper/liquidity.go +++ b/x/dex/keeper/liquidity.go @@ -4,8 +4,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) Swap( @@ -146,7 +146,7 @@ func (k Keeper) TakerLimitOrderSwap( } if totalInCoin.Amount.IsZero() { - return sdk.Coin{}, sdk.Coin{}, types.ErrLimitPriceNotSatisfied + return sdk.Coin{}, sdk.Coin{}, types.ErrNoLiquidity } truePrice := math_utils.NewPrecDecFromInt(totalOutCoin.Amount).QuoInt(totalInCoin.Amount) diff --git a/x/dex/keeper/liquidity_iterator.go b/x/dex/keeper/liquidity_iterator.go index 107216641..b85b5aeb5 100644 --- a/x/dex/keeper/liquidity_iterator.go +++ b/x/dex/keeper/liquidity_iterator.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type LiquidityIterator struct { diff --git a/x/dex/keeper/liquidity_test.go b/x/dex/keeper/liquidity_test.go index cf00d3431..f5d4458f3 100644 --- a/x/dex/keeper/liquidity_test.go +++ b/x/dex/keeper/liquidity_test.go @@ -6,7 +6,7 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // TODO: In an ideal world, there should be enough lower level testing that the swap tests diff --git a/x/dex/keeper/migrations.go b/x/dex/keeper/migrations.go index 40ae77bf4..ff154a91a 100644 --- a/x/dex/keeper/migrations.go +++ b/x/dex/keeper/migrations.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v3 "github.com/neutron-org/neutron/v4/x/dex/migrations/v3" - v4 "github.com/neutron-org/neutron/v4/x/dex/migrations/v4" + v3 "github.com/neutron-org/neutron/v5/x/dex/migrations/v3" + v4 "github.com/neutron-org/neutron/v5/x/dex/migrations/v4" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/dex/keeper/msg_server.go b/x/dex/keeper/msg_server.go index 1211cc57b..a54b9dc0d 100644 --- a/x/dex/keeper/msg_server.go +++ b/x/dex/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type MsgServer struct { @@ -38,7 +38,7 @@ func (k MsgServer) Deposit( callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) - pairID, err := types.NewPairIDFromUnsorted(msg.TokenA, msg.TokenB) + pairID, err := types.NewPairID(msg.TokenA, msg.TokenB) if err != nil { return nil, err } @@ -48,7 +48,7 @@ func (k MsgServer) Deposit( tickIndexes := NormalizeAllTickIndexes(msg.TokenA, pairID.Token0, msg.TickIndexesAToB) - Amounts0Deposit, Amounts1Deposit, _, failedDeposits, err := k.DepositCore( + Amounts0Deposit, Amounts1Deposit, sharesIssued, failedDeposits, err := k.DepositCore( goCtx, pairID, callerAddr, @@ -67,6 +67,7 @@ func (k MsgServer) Deposit( Reserve0Deposited: Amounts0Deposit, Reserve1Deposited: Amounts1Deposit, FailedDeposits: failedDeposits, + SharesIssued: sharesIssued, }, nil } @@ -85,14 +86,14 @@ func (k MsgServer) Withdrawal( callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) - pairID, err := types.NewPairIDFromUnsorted(msg.TokenA, msg.TokenB) + pairID, err := types.NewPairID(msg.TokenA, msg.TokenB) if err != nil { return nil, err } tickIndexes := NormalizeAllTickIndexes(msg.TokenA, pairID.Token0, msg.TickIndexesAToB) - err = k.WithdrawCore( + reserve0ToRemoved, reserve1ToRemoved, sharesBurned, err := k.WithdrawCore( goCtx, pairID, callerAddr, @@ -105,7 +106,11 @@ func (k MsgServer) Withdrawal( return nil, err } - return &types.MsgWithdrawalResponse{}, nil + return &types.MsgWithdrawalResponse{ + Reserve0Withdrawn: reserve0ToRemoved, + Reserve1Withdrawn: reserve1ToRemoved, + SharesBurned: sharesBurned, + }, nil } func (k MsgServer) PlaceLimitOrder( @@ -136,7 +141,7 @@ func (k MsgServer) PlaceLimitOrder( return &types.MsgPlaceLimitOrderResponse{}, errors.Wrapf(err, "invalid LimitSellPrice %s", msg.LimitSellPrice.String()) } } - trancheKey, coinIn, _, coinOutSwap, err := k.PlaceLimitOrderCore( + trancheKey, coinIn, swapInCoin, coinOutSwap, err := k.PlaceLimitOrderCore( goCtx, msg.TokenIn, msg.TokenOut, @@ -156,6 +161,7 @@ func (k MsgServer) PlaceLimitOrder( TrancheKey: trancheKey, CoinIn: coinIn, TakerCoinOut: coinOutSwap, + TakerCoinIn: swapInCoin, }, nil } @@ -173,7 +179,7 @@ func (k MsgServer) WithdrawFilledLimitOrder( callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) - err := k.WithdrawFilledLimitOrderCore( + takerCoinOut, makerCoinOut, err := k.WithdrawFilledLimitOrderCore( goCtx, msg.TrancheKey, callerAddr, @@ -182,7 +188,10 @@ func (k MsgServer) WithdrawFilledLimitOrder( return &types.MsgWithdrawFilledLimitOrderResponse{}, err } - return &types.MsgWithdrawFilledLimitOrderResponse{}, nil + return &types.MsgWithdrawFilledLimitOrderResponse{ + TakerCoinOut: takerCoinOut, + MakerCoinOut: makerCoinOut, + }, nil } func (k MsgServer) CancelLimitOrder( @@ -199,7 +208,7 @@ func (k MsgServer) CancelLimitOrder( callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) - err := k.CancelLimitOrderCore( + makerCoinOut, takerCoinOut, err := k.CancelLimitOrderCore( goCtx, msg.TrancheKey, callerAddr, @@ -208,7 +217,10 @@ func (k MsgServer) CancelLimitOrder( return &types.MsgCancelLimitOrderResponse{}, err } - return &types.MsgCancelLimitOrderResponse{}, nil + return &types.MsgCancelLimitOrderResponse{ + TakerCoinOut: takerCoinOut, + MakerCoinOut: makerCoinOut, + }, nil } func (k MsgServer) MultiHopSwap( @@ -226,7 +238,7 @@ func (k MsgServer) MultiHopSwap( callerAddr := sdk.MustAccAddressFromBech32(msg.Creator) receiverAddr := sdk.MustAccAddressFromBech32(msg.Receiver) - coinOut, err := k.MultiHopSwapCore( + coinOut, route, dust, err := k.MultiHopSwapCore( goCtx, msg.AmountIn, msg.Routes, @@ -238,7 +250,11 @@ func (k MsgServer) MultiHopSwap( if err != nil { return &types.MsgMultiHopSwapResponse{}, err } - return &types.MsgMultiHopSwapResponse{CoinOut: coinOut}, nil + return &types.MsgMultiHopSwapResponse{ + CoinOut: coinOut, + Route: &types.MultiHopRoute{Hops: route}, + Dust: dust, + }, nil } func (k MsgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { diff --git a/x/dex/keeper/msg_server_test.go b/x/dex/keeper/msg_server_test.go index 905d129aa..c790a17e0 100644 --- a/x/dex/keeper/msg_server_test.go +++ b/x/dex/keeper/msg_server_test.go @@ -13,13 +13,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil/apptesting" - "github.com/neutron-org/neutron/v4/testutil/common/sample" - testkeeper "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper" - testutils "github.com/neutron-org/neutron/v4/x/dex/keeper/internal/testutils" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/apptesting" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + testkeeper "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper" + testutils "github.com/neutron-org/neutron/v5/x/dex/keeper/internal/testutils" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // Test suite diff --git a/x/dex/keeper/multihop_swap.go b/x/dex/keeper/multihop_swap.go index ab1ad4798..81e912306 100644 --- a/x/dex/keeper/multihop_swap.go +++ b/x/dex/keeper/multihop_swap.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type MultihopStep struct { @@ -35,12 +35,12 @@ func (k Keeper) MultiHopSwapCore( pickBestRoute bool, callerAddr sdk.AccAddress, receiverAddr sdk.AccAddress, -) (coinOut sdk.Coin, err error) { +) (coinOut sdk.Coin, route []string, dust sdk.Coins, err error) { ctx := sdk.UnwrapSDKContext(goCtx) bestRoute, initialInCoin, err := k.CalulateMultiHopSwap(ctx, amountIn, routes, exitLimitPrice, pickBestRoute) if err != nil { - return sdk.Coin{}, err + return sdk.Coin{}, []string{}, sdk.Coins{}, err } bestRoute.write() @@ -51,7 +51,7 @@ func (k Keeper) MultiHopSwapCore( sdk.Coins{initialInCoin}, ) if err != nil { - return sdk.Coin{}, err + return sdk.Coin{}, []string{}, sdk.Coins{}, err } // send both dust and coinOut to receiver @@ -63,7 +63,7 @@ func (k Keeper) MultiHopSwapCore( bestRoute.dust.Add(bestRoute.coinOut), ) if err != nil { - return sdk.Coin{}, fmt.Errorf("failed to send out coin and dust to the receiver: %w", err) + return sdk.Coin{}, []string{}, sdk.Coins{}, fmt.Errorf("failed to send out coin and dust to the receiver: %w", err) } ctx.EventManager().EmitEvent(types.CreateMultihopSwapEvent( @@ -77,7 +77,7 @@ func (k Keeper) MultiHopSwapCore( bestRoute.dust, )) - return bestRoute.coinOut, nil + return bestRoute.coinOut, bestRoute.route, bestRoute.dust, nil } // CalulateMultiHopSwap handles the core logic for MultiHopSwap -- simulating swap operations across all routes (when applicable) @@ -284,7 +284,7 @@ func (k Keeper) SwapFullAmountIn( return sdk.Coin{}, sdk.Coin{}, err } if !orderFilled { - return sdk.Coin{}, sdk.Coin{}, types.ErrLimitPriceNotSatisfied + return sdk.Coin{}, sdk.Coin{}, types.ErrNoLiquidity } dust = sdk.Coin.Sub(sdk.NewCoin(swapAmountTakerDenom.Denom, amountIn), swapAmountTakerDenom) diff --git a/x/dex/keeper/params.go b/x/dex/keeper/params.go index 6cd94982f..efa743898 100644 --- a/x/dex/keeper/params.go +++ b/x/dex/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // GetParams get all parameters as types.Params diff --git a/x/dex/keeper/params_test.go b/x/dex/keeper/params_test.go index 1e4b112f3..c84ae9294 100644 --- a/x/dex/keeper/params_test.go +++ b/x/dex/keeper/params_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestGetParams(t *testing.T) { diff --git a/x/dex/keeper/place_limit_order.go b/x/dex/keeper/place_limit_order.go index 4025164c0..a6b3cc3a1 100644 --- a/x/dex/keeper/place_limit_order.go +++ b/x/dex/keeper/place_limit_order.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/types" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // PlaceLimitOrderCore handles the logic for MsgPlaceLimitOrder including bank operations and event emissions. @@ -84,6 +84,8 @@ func (k Keeper) PlaceLimitOrderCore( orderType.String(), sharesIssued, trancheKey, + swapInCoin.Amount, + swapOutCoin.Amount, )) return trancheKey, totalInCoin, swapInCoin, swapOutCoin, nil diff --git a/x/dex/keeper/pool.go b/x/dex/keeper/pool.go index f4c5e5030..5b95ec959 100644 --- a/x/dex/keeper/pool.go +++ b/x/dex/keeper/pool.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" - "github.com/neutron-org/neutron/v4/x/dex/utils" + "github.com/neutron-org/neutron/v5/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) func (k Keeper) GetOrInitPool( diff --git a/x/dex/keeper/pool_metadata.go b/x/dex/keeper/pool_metadata.go index 43dbc8f06..ed9a9f497 100644 --- a/x/dex/keeper/pool_metadata.go +++ b/x/dex/keeper/pool_metadata.go @@ -7,7 +7,7 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // SetPoolMetadata set a specific poolMetadata in the store diff --git a/x/dex/keeper/pool_metadata_test.go b/x/dex/keeper/pool_metadata_test.go index 7b0c52931..1e9081ee8 100644 --- a/x/dex/keeper/pool_metadata_test.go +++ b/x/dex/keeper/pool_metadata_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func createNPoolMetadata(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.PoolMetadata { diff --git a/x/dex/keeper/pool_reserves.go b/x/dex/keeper/pool_reserves.go index 4c2d750fd..df870e21d 100644 --- a/x/dex/keeper/pool_reserves.go +++ b/x/dex/keeper/pool_reserves.go @@ -4,7 +4,7 @@ import ( "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func (k Keeper) SetPoolReserves(ctx sdk.Context, poolReserves *types.PoolReserves) { diff --git a/x/dex/keeper/pool_reserves_test.go b/x/dex/keeper/pool_reserves_test.go index 6ddb2cac8..0e0d4f18e 100644 --- a/x/dex/keeper/pool_reserves_test.go +++ b/x/dex/keeper/pool_reserves_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func createNPoolReserves(k *keeper.Keeper, ctx sdk.Context, n int) []*types.PoolReserves { diff --git a/x/dex/keeper/pool_test.go b/x/dex/keeper/pool_test.go index ad4387576..c628b12a3 100644 --- a/x/dex/keeper/pool_test.go +++ b/x/dex/keeper/pool_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func createNPools(k *keeper.Keeper, ctx sdk.Context, n int) []*types.Pool { diff --git a/x/dex/keeper/tick_iterator.go b/x/dex/keeper/tick_iterator.go index 583f77a79..f5933a70d 100644 --- a/x/dex/keeper/tick_iterator.go +++ b/x/dex/keeper/tick_iterator.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type TickIterator struct { diff --git a/x/dex/keeper/tick_liquidity.go b/x/dex/keeper/tick_liquidity.go index 9c0989702..94030ac6f 100644 --- a/x/dex/keeper/tick_liquidity.go +++ b/x/dex/keeper/tick_liquidity.go @@ -5,7 +5,7 @@ import ( storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // GetAllTickLiquidity returns all tickLiquidity diff --git a/x/dex/keeper/tick_liquidity_test.go b/x/dex/keeper/tick_liquidity_test.go index 34e89f800..5472246df 100644 --- a/x/dex/keeper/tick_liquidity_test.go +++ b/x/dex/keeper/tick_liquidity_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "github.com/neutron-org/neutron/v4/testutil/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + keepertest "github.com/neutron-org/neutron/v5/testutil/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func CreateNTickLiquidity(keeper *keeper.Keeper, ctx sdk.Context, n int) []*types.TickLiquidity { diff --git a/x/dex/keeper/withdraw.go b/x/dex/keeper/withdraw.go index 81b117823..75104a4eb 100644 --- a/x/dex/keeper/withdraw.go +++ b/x/dex/keeper/withdraw.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // WithdrawCore handles logic for MsgWithdrawal including bank operations and event emissions. @@ -19,7 +19,7 @@ func (k Keeper) WithdrawCore( sharesToRemoveList []math.Int, tickIndicesNormalized []int64, fees []uint64, -) error { +) (reserves0ToRemoved, reserves1ToRemoved math.Int, sharesBurned sdk.Coins, err error) { ctx := sdk.UnwrapSDKContext(goCtx) totalReserve0ToRemove, totalReserve1ToRemove, coinsToBurn, events, err := k.ExecuteWithdraw( @@ -32,13 +32,13 @@ func (k Keeper) WithdrawCore( fees, ) if err != nil { - return err + return math.ZeroInt(), math.ZeroInt(), nil, err } ctx.EventManager().EmitEvents(events) if err := k.BurnShares(ctx, callerAddr, coinsToBurn); err != nil { - return err + return math.ZeroInt(), math.ZeroInt(), nil, err } if totalReserve0ToRemove.IsPositive() { @@ -52,7 +52,7 @@ func (k Keeper) WithdrawCore( ) ctx.EventManager().EmitEvents(types.GetEventsWithdrawnAmount(sdk.Coins{coin0})) if err != nil { - return err + return math.ZeroInt(), math.ZeroInt(), nil, err } } @@ -66,11 +66,11 @@ func (k Keeper) WithdrawCore( ) ctx.EventManager().EmitEvents(types.GetEventsWithdrawnAmount(sdk.Coins{coin1})) if err != nil { - return err + return math.ZeroInt(), math.ZeroInt(), nil, err } } - return nil + return totalReserve0ToRemove, totalReserve1ToRemove, coinsToBurn, nil } // ExecuteWithdraw handles the core Withdraw logic including calculating and withdrawing reserve0,reserve1 from a specified tick @@ -104,8 +104,8 @@ func (k Keeper) ExecuteWithdraw( // TODO: this is a bit hacky. Since it is possible to have multiple withdrawals from the same pool we have to artificially update the bank balance // In the future we should enforce only one withdraw operation per pool in the message validation alreadyWithdrawnOfDenom := coinsToBurn.AmountOf(poolDenom) - totalShares := k.bankKeeper.GetSupply(ctx, poolDenom).Amount.Sub(alreadyWithdrawnOfDenom) - if totalShares.LT(sharesToRemove) { + sharesOwned := k.bankKeeper.GetBalance(ctx, callerAddr, poolDenom).Amount.Sub(alreadyWithdrawnOfDenom) + if sharesOwned.LT(sharesToRemove) { return math.ZeroInt(), math.ZeroInt(), nil, nil, sdkerrors.Wrapf( types.ErrInsufficientShares, "%s does not have %s shares of type %s", @@ -115,6 +115,7 @@ func (k Keeper) ExecuteWithdraw( ) } + totalShares := k.bankKeeper.GetSupply(ctx, poolDenom).Amount.Sub(alreadyWithdrawnOfDenom) outAmount0, outAmount1 := pool.Withdraw(sharesToRemove, totalShares) // Save both sides of the pool. If one or both sides are empty they will be deleted. diff --git a/x/dex/keeper/withdraw_filled_limit_order.go b/x/dex/keeper/withdraw_filled_limit_order.go index f2a4122ab..17d720e69 100644 --- a/x/dex/keeper/withdraw_filled_limit_order.go +++ b/x/dex/keeper/withdraw_filled_limit_order.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // WithdrawFilledLimitOrderCore handles MsgWithdrawFilledLimitOrder including bank operations and event emissions. @@ -15,37 +15,38 @@ func (k Keeper) WithdrawFilledLimitOrderCore( goCtx context.Context, trancheKey string, callerAddr sdk.AccAddress, -) error { +) (takerCoinOut, makerCoinOut sdk.Coin, err error) { ctx := sdk.UnwrapSDKContext(goCtx) - amountOutTokenOut, remainingTokenIn, tradePairID, err := k.ExecuteWithdrawFilledLimitOrder(ctx, trancheKey, callerAddr) + takerCoinOut, makerCoinOut, err = k.ExecuteWithdrawFilledLimitOrder(ctx, trancheKey, callerAddr) if err != nil { - return err + return sdk.Coin{}, sdk.Coin{}, err } - coinTakerDenomOut := sdk.NewCoin(tradePairID.TakerDenom, amountOutTokenOut) - coinMakerDenomRefund := sdk.NewCoin(tradePairID.MakerDenom, remainingTokenIn) // NOTE: it is possible for coinTakerDenomOut xor coinMakerDenomOut to be zero. These are removed by the sanitize call in sdk.NewCoins // ExecuteWithdrawFilledLimitOrder ensures that at least one of these has am amount > 0. - coins := sdk.NewCoins(coinTakerDenomOut, coinMakerDenomRefund) - ctx.EventManager().EmitEvents(types.GetEventsWithdrawnAmount(sdk.NewCoins(coinTakerDenomOut))) + coins := sdk.NewCoins(takerCoinOut, makerCoinOut) + ctx.EventManager().EmitEvents(types.GetEventsWithdrawnAmount(sdk.NewCoins(takerCoinOut))) if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, callerAddr, coins); err != nil { - return err + return sdk.Coin{}, sdk.Coin{}, err } + makerDenom := makerCoinOut.Denom + takerDenom := takerCoinOut.Denom // This will never panic since TradePairID has already been successfully constructed by ExecuteWithdrawFilledLimitOrder - pairID := tradePairID.MustPairID() + pairID := types.MustNewPairID(makerDenom, takerDenom) ctx.EventManager().EmitEvent(types.WithdrawFilledLimitOrderEvent( callerAddr, pairID.Token0, pairID.Token1, - tradePairID.MakerDenom, - tradePairID.TakerDenom, - amountOutTokenOut, + makerDenom, + takerDenom, + takerCoinOut.Amount, + makerCoinOut.Amount, trancheKey, )) - return nil + return takerCoinOut, makerCoinOut, nil } // ExecuteWithdrawFilledLimitOrder handles the for logic for WithdrawFilledLimitOrder -- calculates and sends filled liquidity from module to user, @@ -55,14 +56,14 @@ func (k Keeper) ExecuteWithdrawFilledLimitOrder( ctx sdk.Context, trancheKey string, callerAddr sdk.AccAddress, -) (amountOutTokenOut, remainingTokenIn math.Int, tradePairID *types.TradePairID, err error) { +) (takerCoinOut, makerCoinOut sdk.Coin, err error) { trancheUser, found := k.GetLimitOrderTrancheUser( ctx, callerAddr.String(), trancheKey, ) if !found { - return math.ZeroInt(), math.ZeroInt(), nil, sdkerrors.Wrapf(types.ErrValidLimitOrderTrancheNotFound, "%s", trancheKey) + return makerCoinOut, takerCoinOut, sdkerrors.Wrapf(types.ErrValidLimitOrderTrancheNotFound, "%s", trancheKey) } tradePairID, tickIndex := trancheUser.TradePairId, trancheUser.TickIndexTakerToMaker @@ -76,8 +77,8 @@ func (k Keeper) ExecuteWithdrawFilledLimitOrder( }, ) - amountOutTokenOut = math.ZeroInt() - remainingTokenIn = math.ZeroInt() + amountOutTokenOut := math.ZeroInt() + remainingTokenIn := math.ZeroInt() // It's possible that a TrancheUser exists but tranche does not if LO was filled entirely through a swap if found { var amountOutTokenIn math.Int @@ -102,8 +103,11 @@ func (k Keeper) ExecuteWithdrawFilledLimitOrder( k.UpdateTrancheUser(ctx, trancheUser) if !amountOutTokenOut.IsPositive() && !remainingTokenIn.IsPositive() { - return math.ZeroInt(), math.ZeroInt(), tradePairID, types.ErrWithdrawEmptyLimitOrder + return takerCoinOut, makerCoinOut, types.ErrWithdrawEmptyLimitOrder } - return amountOutTokenOut, remainingTokenIn, tradePairID, nil + takerCoinOut = sdk.NewCoin(tradePairID.TakerDenom, amountOutTokenOut) + makerCoinOut = sdk.NewCoin(tradePairID.MakerDenom, remainingTokenIn) + + return takerCoinOut, makerCoinOut, nil } diff --git a/x/dex/migrations/v3/store.go b/x/dex/migrations/v3/store.go index bb26392f1..786c89753 100644 --- a/x/dex/migrations/v3/store.go +++ b/x/dex/migrations/v3/store.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" - v2types "github.com/neutron-org/neutron/v4/x/dex/types/v2" + "github.com/neutron-org/neutron/v5/x/dex/types" + v2types "github.com/neutron-org/neutron/v5/x/dex/types/v2" ) // MigrateStore performs in-place store migrations. diff --git a/x/dex/migrations/v3/store_test.go b/x/dex/migrations/v3/store_test.go index 7dc44dc37..f884a6b54 100644 --- a/x/dex/migrations/v3/store_test.go +++ b/x/dex/migrations/v3/store_test.go @@ -8,12 +8,12 @@ import ( "cosmossdk.io/store/prefix" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/utils/math" - v3 "github.com/neutron-org/neutron/v4/x/dex/migrations/v3" - "github.com/neutron-org/neutron/v4/x/dex/types" - v2types "github.com/neutron-org/neutron/v4/x/dex/types/v2" - "github.com/neutron-org/neutron/v4/x/dex/utils" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/utils/math" + v3 "github.com/neutron-org/neutron/v5/x/dex/migrations/v3" + "github.com/neutron-org/neutron/v5/x/dex/types" + v2types "github.com/neutron-org/neutron/v5/x/dex/types/v2" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) type V3DexMigrationTestSuite struct { diff --git a/x/dex/migrations/v4/store.go b/x/dex/migrations/v4/store.go index 61dd9a922..b9546a179 100644 --- a/x/dex/migrations/v4/store.go +++ b/x/dex/migrations/v4/store.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // MigrateStore performs in-place store migrations. diff --git a/x/dex/migrations/v4/store_test.go b/x/dex/migrations/v4/store_test.go index 10aa1bded..9957b90f9 100644 --- a/x/dex/migrations/v4/store_test.go +++ b/x/dex/migrations/v4/store_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/utils/math" - v4 "github.com/neutron-org/neutron/v4/x/dex/migrations/v4" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/utils/math" + v4 "github.com/neutron-org/neutron/v5/x/dex/migrations/v4" + "github.com/neutron-org/neutron/v5/x/dex/types" ) type V4DexMigrationTestSuite struct { diff --git a/x/dex/module.go b/x/dex/module.go index f2fa6cb52..5e986448c 100644 --- a/x/dex/module.go +++ b/x/dex/module.go @@ -19,9 +19,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/dex/client/cli" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/client/cli" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) var ( diff --git a/x/dex/module_simulation.go b/x/dex/module_simulation.go index b6fc4c12f..f62d9a19b 100644 --- a/x/dex/module_simulation.go +++ b/x/dex/module_simulation.go @@ -8,9 +8,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/neutron-org/neutron/v4/testutil/common/sample" - dexsimulation "github.com/neutron-org/neutron/v4/x/dex/simulation" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + dexsimulation "github.com/neutron-org/neutron/v5/x/dex/simulation" + "github.com/neutron-org/neutron/v5/x/dex/types" ) // avoid unused import issue diff --git a/x/dex/simulation/cancel_limit_order.go b/x/dex/simulation/cancel_limit_order.go index 1326ddca8..b7c2422c1 100644 --- a/x/dex/simulation/cancel_limit_order.go +++ b/x/dex/simulation/cancel_limit_order.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func SimulateMsgCancelLimitOrder( diff --git a/x/dex/simulation/deposit.go b/x/dex/simulation/deposit.go index e122cb262..ffc55b9b7 100644 --- a/x/dex/simulation/deposit.go +++ b/x/dex/simulation/deposit.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func SimulateMsgDeposit( diff --git a/x/dex/simulation/multi_hop_swap.go b/x/dex/simulation/multi_hop_swap.go index eec7070cb..55cb251d0 100644 --- a/x/dex/simulation/multi_hop_swap.go +++ b/x/dex/simulation/multi_hop_swap.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func SimulateMsgMultiHopSwap( diff --git a/x/dex/simulation/place_limit_order.go b/x/dex/simulation/place_limit_order.go index 1b1c15ee3..de5b3cbf8 100644 --- a/x/dex/simulation/place_limit_order.go +++ b/x/dex/simulation/place_limit_order.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func SimulateMsgPlaceLimitOrder( diff --git a/x/dex/simulation/withdrawl.go b/x/dex/simulation/withdrawl.go index ba5cce907..f45ea2986 100644 --- a/x/dex/simulation/withdrawl.go +++ b/x/dex/simulation/withdrawl.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func SimulateMsgWithdrawal( diff --git a/x/dex/simulation/withdrawl_filled_limit_order.go b/x/dex/simulation/withdrawl_filled_limit_order.go index ede547d4e..72c6f6b58 100644 --- a/x/dex/simulation/withdrawl_filled_limit_order.go +++ b/x/dex/simulation/withdrawl_filled_limit_order.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/neutron-org/neutron/v4/x/dex/keeper" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/keeper" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func SimulateMsgWithdrawFilledLimitOrder( diff --git a/x/dex/types/deposit_record.pb.go b/x/dex/types/deposit_record.pb.go index 8d3ca7286..03345af53 100644 --- a/x/dex/types/deposit_record.pb.go +++ b/x/dex/types/deposit_record.pb.go @@ -120,30 +120,30 @@ var fileDescriptor_250413eadaebbf28 = []byte{ // 410 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x3f, 0x8f, 0x94, 0x40, 0x18, 0xc6, 0x19, 0xc1, 0x3d, 0x1d, 0xfc, 0x73, 0xc7, 0xa9, 0xc1, 0x2d, 0x80, 0x50, 0x11, 0xf5, - 0x20, 0x51, 0x2b, 0xcb, 0xcd, 0x26, 0x86, 0x4a, 0x83, 0x56, 0x36, 0x84, 0x63, 0x46, 0x76, 0xb2, - 0xc0, 0x4b, 0x86, 0x59, 0x8f, 0xfb, 0x16, 0x7e, 0xac, 0xab, 0xcc, 0x95, 0xc6, 0x82, 0x98, 0xdd, - 0xce, 0xd2, 0x4f, 0x60, 0x66, 0x40, 0x0f, 0x1a, 0xbb, 0xf7, 0x7d, 0xe6, 0xf7, 0xce, 0x33, 0x4f, - 0xde, 0xc1, 0x5e, 0x4d, 0x77, 0x82, 0x43, 0x1d, 0x11, 0xda, 0x45, 0x84, 0x36, 0xd0, 0x32, 0x91, - 0x72, 0x9a, 0x03, 0x27, 0x61, 0xc3, 0x41, 0x80, 0x65, 0x8e, 0x44, 0x48, 0x68, 0xb7, 0x7c, 0x54, - 0x40, 0x01, 0x4a, 0x8f, 0x64, 0x35, 0x20, 0xcb, 0xa7, 0xd3, 0x4b, 0x9a, 0x8c, 0xf1, 0x94, 0x8d, - 0xd3, 0xcb, 0x27, 0xb3, 0x23, 0x80, 0x72, 0xd0, 0xfd, 0x6f, 0x3a, 0xbe, 0xbf, 0x1e, 0xec, 0x12, - 0xe5, 0x66, 0xbd, 0xc0, 0x47, 0xe3, 0xa8, 0x8d, 0x3c, 0x14, 0x98, 0x2f, 0x4f, 0xc3, 0x89, 0x73, - 0xf8, 0x3e, 0x63, 0x3c, 0x5e, 0x27, 0x0b, 0xc9, 0xc4, 0xc4, 0x2a, 0xf0, 0xbd, 0x76, 0x93, 0x71, - 0xda, 0xa6, 0x70, 0x51, 0x53, 0x62, 0xdf, 0xf2, 0x50, 0x70, 0x77, 0xb5, 0xbe, 0xea, 0x5d, 0xed, - 0x47, 0xef, 0x3e, 0xce, 0xa1, 0xad, 0xa0, 0x6d, 0xc9, 0x36, 0x64, 0x10, 0x55, 0x99, 0xd8, 0x84, - 0x71, 0x2d, 0x7e, 0xf5, 0xee, 0x6c, 0xe8, 0x77, 0xef, 0x9e, 0x5e, 0x66, 0x55, 0xf9, 0xc6, 0x9f, - 0xaa, 0x7e, 0x62, 0x0e, 0xed, 0x3b, 0xd9, 0x59, 0xcf, 0xf0, 0x49, 0x4e, 0x6b, 0x41, 0x79, 0x2a, - 0x58, 0xbe, 0x4d, 0x59, 0x4d, 0x68, 0x67, 0xeb, 0x1e, 0x0a, 0xf4, 0xe4, 0xe1, 0x70, 0xf0, 0x91, - 0xe5, 0xdb, 0x58, 0xca, 0x56, 0x80, 0x8f, 0x4b, 0xb8, 0x98, 0xa3, 0x86, 0x42, 0x1f, 0x28, 0x7d, - 0x46, 0xee, 0x9a, 0x66, 0x4e, 0xde, 0x1e, 0x48, 0xa5, 0xdf, 0x90, 0xc7, 0x58, 0xff, 0x4c, 0xa9, - 0xbd, 0xf0, 0x50, 0x60, 0x24, 0xb2, 0x94, 0xd1, 0x05, 0x88, 0xac, 0x4c, 0x87, 0x67, 0xda, 0x47, - 0xff, 0xa2, 0xa3, 0xff, 0x46, 0x9f, 0x0e, 0xdd, 0x44, 0x9f, 0xaa, 0x7e, 0x62, 0xaa, 0xf6, 0x83, - 0xea, 0xac, 0xe7, 0xd8, 0x90, 0x1b, 0xb3, 0xef, 0xa8, 0x75, 0x9c, 0xcc, 0xd7, 0x01, 0x50, 0xae, - 0x0c, 0xe9, 0x99, 0x28, 0x68, 0xf5, 0xf6, 0x6a, 0xef, 0xa0, 0xeb, 0xbd, 0x83, 0x7e, 0xee, 0x1d, - 0xf4, 0xf5, 0xe0, 0x68, 0xd7, 0x07, 0x47, 0xfb, 0x7e, 0x70, 0xb4, 0x4f, 0x67, 0x05, 0x13, 0x9b, - 0xdd, 0x79, 0x98, 0x43, 0x15, 0x8d, 0x57, 0x9c, 0x01, 0x2f, 0xfe, 0xd6, 0xd1, 0x97, 0xd7, 0x51, - 0xa7, 0xbe, 0x87, 0xb8, 0x6c, 0x68, 0x7b, 0xbe, 0x50, 0x1f, 0xe4, 0xd5, 0x9f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x53, 0xa8, 0xdc, 0x43, 0x9a, 0x02, 0x00, 0x00, + 0x20, 0xd1, 0xd8, 0x58, 0x6e, 0x36, 0x31, 0x54, 0x1a, 0xb4, 0xb2, 0x21, 0x1c, 0x33, 0xb2, 0x93, + 0x05, 0x5e, 0x32, 0xcc, 0x7a, 0xdc, 0xb7, 0xf0, 0x63, 0x5d, 0x65, 0xae, 0x34, 0x16, 0xc4, 0xec, + 0x76, 0x96, 0x7e, 0x02, 0x33, 0x03, 0x7a, 0xd0, 0xd8, 0xbd, 0xef, 0x33, 0xbf, 0x77, 0x9e, 0x79, + 0xf2, 0x0e, 0xf6, 0x6a, 0xba, 0x13, 0x1c, 0xea, 0x88, 0xd0, 0x2e, 0x22, 0xb4, 0x81, 0x96, 0x89, + 0x94, 0xd3, 0x1c, 0x38, 0x09, 0x1b, 0x0e, 0x02, 0x2c, 0x73, 0x24, 0x42, 0x42, 0xbb, 0xe5, 0xa3, + 0x02, 0x0a, 0x50, 0x7a, 0x24, 0xab, 0x01, 0x59, 0x3e, 0x9d, 0x5e, 0xd2, 0x64, 0x8c, 0xa7, 0x6c, + 0x9c, 0x5e, 0x3e, 0x99, 0x1d, 0x01, 0x94, 0x83, 0xee, 0x7f, 0xd3, 0xf1, 0xfd, 0xf5, 0x60, 0x97, + 0x28, 0x37, 0xeb, 0x05, 0x3e, 0x1a, 0x47, 0x6d, 0xe4, 0xa1, 0xc0, 0x7c, 0x79, 0x1a, 0x4e, 0x9c, + 0xc3, 0xf7, 0x19, 0xe3, 0xf1, 0x3a, 0x59, 0x48, 0x26, 0x26, 0x56, 0x81, 0xef, 0xb5, 0x9b, 0x8c, + 0xd3, 0x36, 0x85, 0x8b, 0x9a, 0x12, 0xfb, 0x96, 0x87, 0x82, 0xbb, 0xab, 0xf5, 0x55, 0xef, 0x6a, + 0x3f, 0x7a, 0xf7, 0x71, 0x0e, 0x6d, 0x05, 0x6d, 0x4b, 0xb6, 0x21, 0x83, 0xa8, 0xca, 0xc4, 0x26, + 0x8c, 0x6b, 0xf1, 0xab, 0x77, 0x67, 0x43, 0xbf, 0x7b, 0xf7, 0xf4, 0x32, 0xab, 0xca, 0x37, 0xfe, + 0x54, 0xf5, 0x13, 0x73, 0x68, 0xdf, 0xc9, 0xce, 0x7a, 0x86, 0x4f, 0x72, 0x5a, 0x0b, 0xca, 0x53, + 0xc1, 0xf2, 0x6d, 0xca, 0x6a, 0x42, 0x3b, 0x5b, 0xf7, 0x50, 0xa0, 0x27, 0x0f, 0x87, 0x83, 0x8f, + 0x2c, 0xdf, 0xc6, 0x52, 0xb6, 0x02, 0x7c, 0x5c, 0xc2, 0xc5, 0x1c, 0x35, 0x14, 0xfa, 0x40, 0xe9, + 0x33, 0x72, 0xd7, 0x34, 0x73, 0xf2, 0xf6, 0x40, 0x2a, 0xfd, 0x86, 0x3c, 0xc6, 0xfa, 0x67, 0x4a, + 0xed, 0x85, 0x87, 0x02, 0x23, 0x91, 0xa5, 0x8c, 0x2e, 0x40, 0x64, 0x65, 0x3a, 0x3c, 0xd3, 0x3e, + 0xfa, 0x17, 0x1d, 0xfd, 0x37, 0xfa, 0x74, 0xe8, 0x26, 0xfa, 0x54, 0xf5, 0x13, 0x53, 0xb5, 0x1f, + 0x54, 0x67, 0x3d, 0xc7, 0x86, 0xdc, 0x98, 0x7d, 0x47, 0xad, 0xe3, 0x64, 0xbe, 0x0e, 0x80, 0x72, + 0x65, 0x48, 0xcf, 0x44, 0x41, 0xab, 0xb7, 0x57, 0x7b, 0x07, 0x5d, 0xef, 0x1d, 0xf4, 0x73, 0xef, + 0xa0, 0xaf, 0x07, 0x47, 0xbb, 0x3e, 0x38, 0xda, 0xf7, 0x83, 0xa3, 0x7d, 0x3a, 0x2b, 0x98, 0xd8, + 0xec, 0xce, 0xc3, 0x1c, 0xaa, 0x68, 0xbc, 0xe2, 0x0c, 0x78, 0xf1, 0xb7, 0x8e, 0xbe, 0xbc, 0x8e, + 0x3a, 0xf5, 0x3d, 0xc4, 0x65, 0x43, 0xdb, 0xf3, 0x85, 0xfa, 0x20, 0xaf, 0xfe, 0x04, 0x00, 0x00, + 0xff, 0xff, 0xcd, 0x2b, 0x06, 0xdc, 0x9a, 0x02, 0x00, 0x00, } func (m *DepositRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/errors.go b/x/dex/types/errors.go index 69211ca8f..d822d49f6 100644 --- a/x/dex/types/errors.go +++ b/x/dex/types/errors.go @@ -27,7 +27,7 @@ var ( ErrValidLimitOrderTrancheNotFound = sdkerrors.Register( ModuleName, 1111, - "Limit order trache not found:", + "Limit order tranche not found:", ) // "%d", trancheKey ErrCancelEmptyLimitOrder = sdkerrors.Register( ModuleName, @@ -69,11 +69,6 @@ var ( 1125, "MaxAmountIn in must be > 0 for swap.", ) - ErrActiveLimitOrderNotFound = sdkerrors.Register( - ModuleName, - 1128, - "No active limit found. It does not exist or has already been filled", - ) ErrZeroWithdraw = sdkerrors.Register( ModuleName, 1129, @@ -224,4 +219,9 @@ var ( 1163, "Cannot convert price to int64 tick value", ) + ErrNoLiquidity = sdkerrors.Register( + ModuleName, + 1164, + "No tradable liquidity below LimitSellPrice", + ) ) diff --git a/x/dex/types/events.go b/x/dex/types/events.go index f24ebcb00..b0ab4956f 100644 --- a/x/dex/types/events.go +++ b/x/dex/types/events.go @@ -19,6 +19,8 @@ const ( AttributeTokenOut = "TokenOut" AttributeAmountIn = "AmountIn" AttributeAmountOut = "AmountOut" + AttributeSwapAmountIn = "SwapAmountIn" + AttributeSwapAmountOut = "SwapAmountOut" AttributeTokenInAmountOut = "TokenInAmountOut" AttributeTokenOutAmountOut = "TokenOutAmountOut" AttributeTickIndex = "TickIndex" @@ -47,6 +49,10 @@ const ( AttributeInc = "inc" AttributeDec = "dec" AttributePairID = "pair_id" + AttributeMakerDenom = "MakerDenom" + AttributeTakerDenom = "TakerDenom" + AttributeSharesOwned = "SharesOwned" + AttributeSharesWithdrawn = "SharesWithdrawn" ) // Event Keys @@ -60,6 +66,8 @@ const ( EventTypeTickUpdate = "TickUpdate" TickUpdateEventKey = "TickUpdate" EventTypeGoodTilPurgeHitGasLimit = "GoodTilPurgeHitGasLimit" + TrancheUserUpdateEventKey = "TrancheUserUpdate" + EventTypeTrancheUserUpdate = "TrancheUserUpdate" // EventTypeNeutronMessage defines the event type used by the Interchain Queries module events. EventTypeNeutronMessage = "neutron" ) @@ -162,6 +170,8 @@ func CreatePlaceLimitOrderEvent( orderType string, shares math.Int, trancheKey string, + swapAmountIn math.Int, + swapAmountOut math.Int, ) sdk.Event { attrs := []sdk.Attribute{ sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), @@ -177,6 +187,8 @@ func CreatePlaceLimitOrderEvent( sdk.NewAttribute(AttributeOrderType, orderType), sdk.NewAttribute(AttributeShares, shares.String()), sdk.NewAttribute(AttributeTrancheKey, trancheKey), + sdk.NewAttribute(AttributeSwapAmountIn, swapAmountIn.String()), + sdk.NewAttribute(AttributeSwapAmountOut, swapAmountOut.String()), } return sdk.NewEvent(sdk.EventTypeMessage, attrs...) @@ -188,7 +200,8 @@ func WithdrawFilledLimitOrderEvent( token1 string, makerDenom string, tokenOut string, - amountOut math.Int, + amountOutTaker math.Int, + amountOutMaker math.Int, trancheKey string, ) sdk.Event { attrs := []sdk.Attribute{ @@ -201,7 +214,10 @@ func WithdrawFilledLimitOrderEvent( sdk.NewAttribute(AttributeTokenIn, makerDenom), sdk.NewAttribute(AttributeTokenOut, tokenOut), sdk.NewAttribute(AttributeTrancheKey, trancheKey), - sdk.NewAttribute(AttributeAmountOut, amountOut.String()), + // DEPRECATED: `AmountOut` will be removed in the next release + sdk.NewAttribute(AttributeAmountOut, amountOutTaker.String()), + sdk.NewAttribute(AttributeTokenOutAmountOut, amountOutTaker.String()), + sdk.NewAttribute(AttributeTokenInAmountOut, amountOutMaker.String()), } return sdk.NewEvent(sdk.EventTypeMessage, attrs...) @@ -213,10 +229,16 @@ func CancelLimitOrderEvent( token1 string, makerDenom string, tokenOut string, - amountOutMaker math.Int, amountOutTaker math.Int, + amountOutMaker math.Int, trancheKey string, ) sdk.Event { + pairID := PairID{Token0: token0, Token1: token1} + takerDenom := pairID.MustOppositeToken(makerDenom) + coinsOut := sdk.NewCoins( + sdk.NewCoin(makerDenom, amountOutMaker), + sdk.NewCoin(takerDenom, amountOutTaker), + ) attrs := []sdk.Attribute{ sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), sdk.NewAttribute(sdk.AttributeKeyAction, CancelLimitOrderEventKey), @@ -226,6 +248,8 @@ func CancelLimitOrderEvent( sdk.NewAttribute(AttributeToken1, token1), sdk.NewAttribute(AttributeTokenIn, makerDenom), sdk.NewAttribute(AttributeTokenOut, tokenOut), + // DEPRECATED: `AmountOut` will be removed in the next release + sdk.NewAttribute(AttributeAmountOut, coinsOut.String()), sdk.NewAttribute(AttributeTokenInAmountOut, amountOutMaker.String()), sdk.NewAttribute(AttributeTokenOutAmountOut, amountOutTaker.String()), sdk.NewAttribute(AttributeTrancheKey, trancheKey), @@ -405,3 +429,20 @@ func GetEventsDecTotalPoolReserves(pairID PairID) sdk.Events { ), } } + +func TrancheUserUpdateEvent(trancheUser LimitOrderTrancheUser) sdk.Event { + pairID := trancheUser.TradePairId.MustPairID() + attrs := []sdk.Attribute{ + sdk.NewAttribute(sdk.AttributeKeyModule, "dex"), + sdk.NewAttribute(sdk.AttributeKeyAction, TrancheUserUpdateEventKey), + sdk.NewAttribute(AttributeTrancheKey, trancheUser.TrancheKey), + sdk.NewAttribute(AttributeCreator, trancheUser.Address), + sdk.NewAttribute(AttributeTickIndex, strconv.Itoa(int(trancheUser.TickIndexTakerToMaker))), + sdk.NewAttribute(AttributeToken0, pairID.Token0), + sdk.NewAttribute(AttributeToken1, pairID.Token1), + sdk.NewAttribute(AttributeTokenIn, trancheUser.TradePairId.MakerDenom), + sdk.NewAttribute(AttributeSharesOwned, trancheUser.SharesOwned.String()), + sdk.NewAttribute(AttributeSharesWithdrawn, trancheUser.SharesWithdrawn.String()), + } + return sdk.NewEvent(EventTypeTrancheUserUpdate, attrs...) +} diff --git a/x/dex/types/expected_keepers.go b/x/dex/types/expected_keepers.go index 339e22037..95c5c7a90 100644 --- a/x/dex/types/expected_keepers.go +++ b/x/dex/types/expected_keepers.go @@ -15,4 +15,5 @@ type BankKeeper interface { BurnCoins(ctx context.Context, moduleName string, amt sdk.Coins) error IterateAccountBalances(ctx context.Context, addr sdk.AccAddress, cb func(sdk.Coin) bool) GetSupply(ctx context.Context, denom string) sdk.Coin + GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin } diff --git a/x/dex/types/genesis.pb.go b/x/dex/types/genesis.pb.go index 167877ac6..50a5e0b85 100644 --- a/x/dex/types/genesis.pb.go +++ b/x/dex/types/genesis.pb.go @@ -116,32 +116,32 @@ func init() { proto.RegisterFile("neutron/dex/genesis.proto", fileDescriptor_0c0 var fileDescriptor_0c051a8a0d58cd8b = []byte{ // 407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xb1, 0xae, 0xda, 0x30, - 0x14, 0x86, 0x93, 0x42, 0x91, 0x6a, 0x3a, 0xb4, 0xa1, 0x43, 0x88, 0x44, 0x48, 0x91, 0x2a, 0xa1, - 0x4a, 0x24, 0x2a, 0xed, 0x13, 0xd0, 0x81, 0x05, 0x54, 0x44, 0xe9, 0xd2, 0x25, 0x32, 0x89, 0x15, - 0x5c, 0x92, 0x38, 0x75, 0x4e, 0x10, 0xbc, 0x45, 0x1f, 0x8b, 0x91, 0xb1, 0x4b, 0xab, 0x2b, 0x78, - 0x91, 0xab, 0xd8, 0x46, 0x4a, 0x74, 0xb9, 0xf7, 0x6e, 0xd6, 0x39, 0x9f, 0xff, 0xcf, 0x3e, 0x36, - 0xea, 0xa6, 0xa4, 0x00, 0xce, 0x52, 0x2f, 0x24, 0x7b, 0x2f, 0x22, 0x29, 0xc9, 0x69, 0xee, 0x66, - 0x9c, 0x01, 0x33, 0xda, 0xaa, 0xe5, 0x86, 0x64, 0x6f, 0xbd, 0x8b, 0x58, 0xc4, 0x44, 0xdd, 0x2b, - 0x57, 0x12, 0xb1, 0x3e, 0x54, 0x77, 0xc7, 0x34, 0xa1, 0xe0, 0x33, 0x1e, 0x12, 0xee, 0x03, 0xc7, - 0x69, 0xb0, 0x21, 0x0a, 0xfb, 0xf8, 0x0c, 0xe6, 0x17, 0x39, 0xe1, 0x8a, 0x35, 0xab, 0x6c, 0x86, - 0x39, 0x4e, 0xd4, 0x79, 0xac, 0x7e, 0xad, 0xc3, 0x58, 0xec, 0x27, 0x04, 0x70, 0x88, 0x01, 0x2b, - 0xc0, 0xa9, 0x02, 0x40, 0x83, 0xad, 0x1f, 0xd3, 0xdf, 0x05, 0x0d, 0x29, 0x1c, 0x24, 0x31, 0xf8, - 0xd7, 0x40, 0xaf, 0xa7, 0xf2, 0x92, 0xdf, 0x01, 0x03, 0x31, 0x3e, 0xa1, 0x96, 0x74, 0x98, 0xba, - 0xa3, 0x0f, 0xdb, 0xe3, 0x8e, 0x5b, 0xb9, 0xb4, 0xbb, 0x10, 0xad, 0x49, 0xf3, 0xf8, 0xbf, 0xaf, - 0x2d, 0x15, 0x68, 0x2c, 0x50, 0xa7, 0x9e, 0xed, 0xc7, 0x34, 0x07, 0xf3, 0x85, 0xd3, 0x18, 0xb6, - 0xc7, 0x56, 0x6d, 0xff, 0x8a, 0x06, 0xdb, 0xd9, 0x15, 0x13, 0x31, 0xfa, 0xf2, 0x2d, 0x54, 0x8b, - 0x33, 0x9a, 0x83, 0x91, 0xa2, 0xf7, 0x34, 0xc5, 0x01, 0xd0, 0x1d, 0xf1, 0x6f, 0x4d, 0x47, 0xe4, - 0x37, 0x44, 0xbe, 0x5d, 0xcb, 0x9f, 0x95, 0xf0, 0xb7, 0x92, 0x5d, 0x49, 0x54, 0x39, 0x7a, 0xd7, - 0xb8, 0x07, 0x80, 0xf0, 0xfd, 0x42, 0xbd, 0xc7, 0x1e, 0x41, 0xba, 0x9a, 0xc2, 0x35, 0x78, 0xda, - 0xf5, 0x23, 0x27, 0x5c, 0xf9, 0xba, 0xf1, 0xad, 0xa6, 0x70, 0xcd, 0x91, 0x51, 0x7b, 0x2a, 0x29, - 0x78, 0x29, 0x04, 0xdd, 0xfa, 0xb0, 0x19, 0x8b, 0xe7, 0x8a, 0x52, 0x23, 0x7f, 0x93, 0x55, 0x6a, - 0x22, 0xae, 0x87, 0x90, 0x88, 0x0b, 0x58, 0x91, 0x82, 0xd9, 0x72, 0xf4, 0x61, 0x73, 0xf9, 0xaa, - 0xac, 0x7c, 0x2d, 0x0b, 0x93, 0xe9, 0xf1, 0x6c, 0xeb, 0xa7, 0xb3, 0xad, 0xdf, 0x9d, 0x6d, 0xfd, - 0xcf, 0xc5, 0xd6, 0x4e, 0x17, 0x5b, 0xfb, 0x7b, 0xb1, 0xb5, 0x9f, 0xa3, 0x88, 0xc2, 0xa6, 0x58, - 0xbb, 0x01, 0x4b, 0x3c, 0x65, 0x1d, 0x31, 0x1e, 0x5d, 0xd7, 0xde, 0xee, 0x8b, 0xb7, 0x97, 0xff, - 0xe6, 0x90, 0x91, 0x7c, 0xdd, 0x12, 0xff, 0xe5, 0xf3, 0x7d, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf2, - 0x99, 0xcb, 0x87, 0x1f, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0xaa, 0xda, 0x40, + 0x14, 0x86, 0x93, 0x6a, 0x85, 0x8e, 0x5d, 0xb4, 0xb1, 0x8b, 0x18, 0x30, 0xa6, 0x42, 0x41, 0x0a, + 0x26, 0xd4, 0xd2, 0x17, 0xb0, 0x0b, 0x37, 0x4a, 0xc5, 0xda, 0x4d, 0x37, 0x61, 0x4c, 0x86, 0x38, + 0x35, 0xc9, 0xa4, 0x93, 0x13, 0xd1, 0xb7, 0xe8, 0x63, 0xb9, 0x74, 0xd9, 0x4d, 0xcb, 0x45, 0x5f, + 0xe4, 0x92, 0x99, 0x11, 0x12, 0xae, 0xf7, 0xde, 0xdd, 0x70, 0xce, 0x37, 0xff, 0x37, 0x73, 0x66, + 0x50, 0x37, 0x25, 0x05, 0x70, 0x96, 0x7a, 0x21, 0xd9, 0x7b, 0x11, 0x49, 0x49, 0x4e, 0x73, 0x37, + 0xe3, 0x0c, 0x98, 0xd1, 0x56, 0x2d, 0x37, 0x24, 0x7b, 0xeb, 0x5d, 0xc4, 0x22, 0x26, 0xea, 0x5e, + 0xb9, 0x92, 0x88, 0xf5, 0xa1, 0xba, 0x3b, 0xa6, 0x09, 0x05, 0x9f, 0xf1, 0x90, 0x70, 0x1f, 0x38, + 0x4e, 0x83, 0x0d, 0x51, 0xd8, 0xc7, 0x67, 0x30, 0xbf, 0xc8, 0x09, 0x57, 0xac, 0x59, 0x65, 0x33, + 0xcc, 0x71, 0xa2, 0xce, 0x63, 0xf5, 0x6b, 0x1d, 0xc6, 0x62, 0x3f, 0x21, 0x80, 0x43, 0x0c, 0x58, + 0x01, 0x4e, 0x15, 0x00, 0x1a, 0x6c, 0xfd, 0x98, 0xfe, 0x2e, 0x68, 0x48, 0xe1, 0x20, 0x89, 0xc1, + 0xbf, 0x06, 0x7a, 0x3d, 0x95, 0x97, 0xfc, 0x0e, 0x18, 0x88, 0xf1, 0x09, 0xb5, 0xa4, 0xc3, 0xd4, + 0x1d, 0x7d, 0xd8, 0x1e, 0x77, 0xdc, 0xca, 0xa5, 0xdd, 0x85, 0x68, 0x4d, 0x9a, 0xc7, 0xff, 0x7d, + 0x6d, 0xa9, 0x40, 0x63, 0x81, 0x3a, 0xf5, 0x6c, 0x3f, 0xa6, 0x39, 0x98, 0x2f, 0x9c, 0xc6, 0xb0, + 0x3d, 0xb6, 0x6a, 0xfb, 0x57, 0x34, 0xd8, 0xce, 0xae, 0x98, 0x88, 0xd1, 0x97, 0x6f, 0xa1, 0x5a, + 0x9c, 0xd1, 0x1c, 0x8c, 0x14, 0xbd, 0xa7, 0x29, 0x0e, 0x80, 0xee, 0x88, 0x7f, 0x6b, 0x3a, 0x22, + 0xbf, 0x21, 0xf2, 0xed, 0x5a, 0xfe, 0xac, 0x84, 0xbf, 0x95, 0xec, 0x4a, 0xa2, 0xca, 0xd1, 0xbb, + 0xc6, 0x3d, 0x00, 0x84, 0xef, 0x17, 0xea, 0x3d, 0xf6, 0x08, 0xd2, 0xd5, 0x14, 0xae, 0xc1, 0xd3, + 0xae, 0x1f, 0x39, 0xe1, 0xca, 0xd7, 0x8d, 0x6f, 0x35, 0x85, 0x6b, 0x8e, 0x8c, 0xda, 0x53, 0x49, + 0xc1, 0x4b, 0x21, 0xe8, 0xd6, 0x87, 0xcd, 0x58, 0x3c, 0x57, 0x94, 0x1a, 0xf9, 0x9b, 0xac, 0x52, + 0x13, 0x71, 0x3d, 0x84, 0x44, 0x5c, 0xc0, 0x8a, 0x14, 0xcc, 0x96, 0xa3, 0x0f, 0x9b, 0xcb, 0x57, + 0x65, 0xe5, 0x6b, 0x59, 0x98, 0x4c, 0x8f, 0x67, 0x5b, 0x3f, 0x9d, 0x6d, 0xfd, 0xee, 0x6c, 0xeb, + 0x7f, 0x2e, 0xb6, 0x76, 0xba, 0xd8, 0xda, 0xdf, 0x8b, 0xad, 0xfd, 0x1c, 0x45, 0x14, 0x36, 0xc5, + 0xda, 0x0d, 0x58, 0xe2, 0x29, 0xeb, 0x88, 0xf1, 0xe8, 0xba, 0xf6, 0x76, 0x5f, 0xbc, 0xbd, 0xfc, + 0x37, 0x87, 0x8c, 0xe4, 0xeb, 0x96, 0xf8, 0x2f, 0x9f, 0xef, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6c, + 0x1a, 0x11, 0x18, 0x1f, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/genesis_test.go b/x/dex/types/genesis_test.go index 200ced0db..dcded4b7b 100644 --- a/x/dex/types/genesis_test.go +++ b/x/dex/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/dex/types/keys.go b/x/dex/types/keys.go index 8ac1cbb76..9f6622d90 100644 --- a/x/dex/types/keys.go +++ b/x/dex/types/keys.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dex/utils" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) const ( @@ -207,3 +207,6 @@ func JITGoodTilTime() time.Time { const ( ExpiringLimitOrderGas = 10_000 ) + +// Dummy Address used for simulate queries +const DummyAddress = "neutron1pq7j6za5zjcl3um9t5gfyleues336tv04tyq0k" diff --git a/x/dex/types/limit_order_expiration.pb.go b/x/dex/types/limit_order_expiration.pb.go index c983de898..1a53614ac 100644 --- a/x/dex/types/limit_order_expiration.pb.go +++ b/x/dex/types/limit_order_expiration.pb.go @@ -104,9 +104,9 @@ var fileDescriptor_61264397cad6ae82 = []byte{ 0x1a, 0x3c, 0x41, 0x5c, 0x50, 0xa1, 0xa0, 0xd4, 0x34, 0x27, 0xf7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x87, 0xfa, 0x58, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd1, 0xaf, 0x00, 0x07, + 0xd5, 0x87, 0xfa, 0x58, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x00, 0x07, 0x56, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x5d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x2e, 0x39, 0x12, 0x8d, 0x48, 0x01, 0x00, 0x00, + 0xff, 0xb0, 0xba, 0xc8, 0x12, 0x48, 0x01, 0x00, 0x00, } func (m *LimitOrderExpiration) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche.go b/x/dex/types/limit_order_tranche.go index faea72e3d..5ea40d2ce 100644 --- a/x/dex/types/limit_order_tranche.go +++ b/x/dex/types/limit_order_tranche.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/utils" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) func NewLimitOrderTranche( @@ -147,6 +147,11 @@ func (t *LimitOrderTranche) CalcWithdrawAmount(trancheUser *LimitOrderTrancheUse ratioFilled := t.RatioFilled() maxAllowedToWithdraw := ratioFilled.MulInt(trancheUser.SharesOwned) sharesToWithdrawDec := maxAllowedToWithdraw.Sub(math_utils.NewPrecDecFromInt(trancheUser.SharesWithdrawn)) + + // Given rounding it is possible for sharesToWithdrawn > maxAllowedToWithdraw. In this case we just exit. + if !sharesToWithdrawDec.IsPositive() { + return math.ZeroInt(), math.ZeroInt() + } amountOutTokenOutDec := sharesToWithdrawDec.Quo(t.PriceTakerToMaker) // Round shares withdrawn up and amountOut down to ensure math favors dex diff --git a/x/dex/types/limit_order_tranche.pb.go b/x/dex/types/limit_order_tranche.pb.go index e35ecd9cc..e8a8104b1 100644 --- a/x/dex/types/limit_order_tranche.pb.go +++ b/x/dex/types/limit_order_tranche.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + github_com_neutron_org_neutron_v5_utils_math "github.com/neutron-org/neutron/v5/utils/math" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -99,7 +99,7 @@ type LimitOrderTranche struct { // All JIT orders have a expiration_time of 0 and an exception is made to still treat these orders as live // Order deletion still functions the same and the orders will be deleted at the end of the block ExpirationTime *time.Time `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time,omitempty"` - PriceTakerToMaker github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,7,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"price_taker_to_maker" yaml:"price_taker_to_maker"` + PriceTakerToMaker github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,7,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"price_taker_to_maker" yaml:"price_taker_to_maker"` } func (m *LimitOrderTranche) Reset() { *m = LimitOrderTranche{} } @@ -160,42 +160,42 @@ func init() { var fileDescriptor_8c2ded67c80756d1 = []byte{ // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x8f, 0xd2, 0x40, - 0x14, 0xc7, 0x19, 0x51, 0x74, 0x87, 0xe8, 0x86, 0x86, 0x4d, 0xba, 0x98, 0xb4, 0xd8, 0xc4, 0x84, - 0xcb, 0xb6, 0x89, 0xbb, 0x07, 0x63, 0x3c, 0x11, 0x12, 0x43, 0x14, 0xdd, 0x34, 0x3d, 0x79, 0x69, - 0x4a, 0x3b, 0x96, 0x09, 0xb4, 0xd3, 0x4c, 0x1f, 0x1b, 0xf0, 0x03, 0x78, 0xde, 0x0f, 0xe1, 0xdd, - 0xaf, 0xc1, 0x71, 0x8f, 0xc6, 0x43, 0x35, 0x70, 0xf3, 0xb8, 0x9f, 0xc0, 0xcc, 0x14, 0x96, 0x22, - 0xd5, 0xcd, 0x9e, 0x98, 0xbe, 0xf7, 0x7f, 0xbc, 0xdf, 0xff, 0x75, 0x5e, 0xf1, 0xf3, 0x98, 0x4c, - 0x81, 0xb3, 0xd8, 0x0a, 0xc8, 0xcc, 0x9a, 0xd0, 0x88, 0x82, 0xcb, 0x78, 0x40, 0xb8, 0x0b, 0xdc, - 0x8b, 0xfd, 0x11, 0x31, 0x13, 0xce, 0x80, 0x29, 0xf5, 0xb5, 0xcc, 0x0c, 0xc8, 0xac, 0xd5, 0x0c, - 0x59, 0xc8, 0x64, 0xdc, 0x12, 0xa7, 0x5c, 0xd2, 0xd2, 0x43, 0xc6, 0xc2, 0x09, 0xb1, 0xe4, 0xd3, - 0x70, 0xfa, 0xc9, 0x02, 0x1a, 0x91, 0x14, 0xbc, 0x28, 0x59, 0x0b, 0x8e, 0x8b, 0xad, 0x12, 0x8f, - 0x72, 0x97, 0x06, 0x9b, 0xda, 0x62, 0x0a, 0xb8, 0x17, 0x10, 0x77, 0x47, 0x60, 0x7c, 0x43, 0xb8, - 0xf9, 0x4e, 0xd0, 0x7d, 0x10, 0x70, 0x4e, 0xce, 0xf6, 0x96, 0xcc, 0x95, 0xd7, 0xf8, 0xf1, 0x8e, - 0x5e, 0x45, 0x6d, 0xd4, 0xa9, 0xbf, 0x50, 0xcd, 0x02, 0xb0, 0xe9, 0x08, 0xc5, 0xb9, 0x47, 0x79, - 0xbf, 0x67, 0xd7, 0xe1, 0xe6, 0x21, 0x50, 0x5e, 0xe2, 0x63, 0xa0, 0xfe, 0xd8, 0xa5, 0x71, 0x40, - 0x66, 0x2e, 0x78, 0x63, 0x61, 0x9c, 0xb9, 0x91, 0x38, 0xa8, 0xf7, 0xda, 0xa8, 0x53, 0xb5, 0x8f, - 0x84, 0xa0, 0x2f, 0xf2, 0x8e, 0x88, 0x3a, 0x6c, 0x20, 0x7e, 0x14, 0x1d, 0xd7, 0xd7, 0x13, 0x72, - 0xc7, 0x64, 0xae, 0x56, 0xdb, 0xa8, 0x73, 0x60, 0x63, 0xb8, 0x01, 0x33, 0x16, 0x35, 0xdc, 0xd8, - 0x23, 0x56, 0x4e, 0x71, 0x55, 0xc8, 0x73, 0xc8, 0x67, 0x3b, 0x90, 0x65, 0xf6, 0x6c, 0xa1, 0x56, - 0xbe, 0x20, 0xdc, 0xe4, 0x24, 0x25, 0xfc, 0x82, 0xa4, 0x39, 0x9b, 0x1b, 0x90, 0x98, 0x45, 0x92, - 0xf0, 0xa0, 0xeb, 0x2c, 0x32, 0xbd, 0xf2, 0x23, 0xd3, 0x8f, 0x7c, 0x96, 0x46, 0x2c, 0x4d, 0x83, - 0xb1, 0x49, 0x99, 0x15, 0x79, 0x30, 0x32, 0xfb, 0x31, 0xfc, 0xce, 0xf4, 0xd2, 0xe2, 0xeb, 0x4c, - 0x7f, 0x3a, 0xf7, 0xa2, 0xc9, 0x2b, 0xa3, 0x2c, 0x6b, 0xd8, 0xca, 0x26, 0x2c, 0xfd, 0xf6, 0x44, - 0x70, 0x17, 0x04, 0x0a, 0x20, 0xd5, 0xbb, 0x82, 0xc0, 0x7f, 0x41, 0xa0, 0x14, 0xc4, 0xd9, 0x82, - 0x7c, 0xc6, 0x0d, 0x60, 0xe0, 0x4d, 0x76, 0xa6, 0x71, 0x5f, 0x42, 0xbc, 0xbf, 0x0d, 0x62, 0xbf, - 0xf2, 0x3a, 0xd3, 0xd5, 0x9c, 0x60, 0x2f, 0x65, 0xd8, 0x87, 0x32, 0x36, 0x28, 0xe9, 0x5d, 0x1c, - 0xc0, 0x83, 0x3b, 0xf5, 0x86, 0x7f, 0xf7, 0x86, 0xfd, 0xde, 0x05, 0xdf, 0x03, 0x7c, 0x48, 0x66, - 0x09, 0xe5, 0x1e, 0x50, 0x16, 0xbb, 0x62, 0xc1, 0xd4, 0x9a, 0xbc, 0x4a, 0x2d, 0x33, 0xdf, 0x3e, - 0x73, 0xb3, 0x7d, 0xa6, 0xb3, 0xd9, 0xbe, 0xee, 0xa3, 0x45, 0xa6, 0xa3, 0xcb, 0x9f, 0x3a, 0xb2, - 0x9f, 0x6c, 0x8b, 0x45, 0x5a, 0xf9, 0x8a, 0x70, 0x33, 0xe1, 0xd4, 0x27, 0x7f, 0x5f, 0xfd, 0x87, - 0xd2, 0x4e, 0xba, 0xb6, 0x73, 0x16, 0x52, 0x18, 0x4d, 0x87, 0xa6, 0xcf, 0x22, 0x6b, 0x7d, 0x63, - 0x4f, 0x18, 0x0f, 0x37, 0x67, 0xeb, 0xe2, 0xcc, 0x9a, 0x02, 0x9d, 0xa4, 0xb9, 0xd3, 0x73, 0x4e, - 0xfc, 0x1e, 0xf1, 0xc5, 0xeb, 0x2e, 0xfb, 0xef, 0xed, 0xeb, 0x2e, 0xcb, 0x1a, 0x76, 0x43, 0x86, - 0x8b, 0xbb, 0xd6, 0x7d, 0xb3, 0x58, 0x6a, 0xe8, 0x6a, 0xa9, 0xa1, 0x5f, 0x4b, 0x0d, 0x5d, 0xae, - 0xb4, 0xca, 0xd5, 0x4a, 0xab, 0x7c, 0x5f, 0x69, 0x95, 0x8f, 0x27, 0xb7, 0x93, 0xcd, 0xf2, 0x6f, - 0xca, 0x3c, 0x21, 0xe9, 0xb0, 0x26, 0xa7, 0x73, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0x75, 0x97, - 0x0b, 0x47, 0xf5, 0x04, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x3b, 0x56, 0xab, 0x3b, 0x45, 0x97, 0x86, 0x2e, 0x64, 0x2b, 0x24, 0x35, 0x20, 0xf4, + 0xb2, 0x09, 0xb8, 0x0a, 0x22, 0x9e, 0x4a, 0x41, 0x8a, 0x56, 0x97, 0x90, 0x93, 0x97, 0x90, 0x26, + 0x63, 0x3a, 0xb4, 0xc9, 0x84, 0xc9, 0xeb, 0xd2, 0xfa, 0x01, 0x3c, 0xef, 0x87, 0xf0, 0xee, 0xd7, + 0xe8, 0x71, 0x8f, 0xe2, 0x21, 0x4a, 0x7b, 0xf3, 0xb8, 0x9f, 0x40, 0x66, 0xd2, 0x6e, 0x53, 0x1b, + 0x5d, 0xf6, 0xd4, 0xc9, 0x7b, 0xff, 0xd7, 0xf7, 0xfb, 0xbf, 0xcc, 0x0b, 0x7e, 0x1a, 0x93, 0x29, + 0x70, 0x16, 0x5b, 0x01, 0x99, 0x59, 0x13, 0x1a, 0x51, 0x70, 0x19, 0x0f, 0x08, 0x77, 0x81, 0x7b, + 0xb1, 0x3f, 0x22, 0x66, 0xc2, 0x19, 0x30, 0xa5, 0xbe, 0x96, 0x99, 0x01, 0x99, 0xb5, 0x9a, 0x21, + 0x0b, 0x99, 0x8c, 0x5b, 0xe2, 0x94, 0x4b, 0x5a, 0x7a, 0xc8, 0x58, 0x38, 0x21, 0x96, 0x7c, 0x1a, + 0x4e, 0x3f, 0x59, 0x40, 0x23, 0x92, 0x82, 0x17, 0x25, 0x6b, 0xc1, 0x71, 0xb1, 0x55, 0xe2, 0x51, + 0xee, 0xd2, 0x60, 0x53, 0x5b, 0x4c, 0x01, 0xf7, 0x02, 0xe2, 0xee, 0x08, 0x8c, 0x6f, 0x08, 0x37, + 0xdf, 0x09, 0xba, 0x0f, 0x02, 0xce, 0xc9, 0xd9, 0xde, 0x92, 0xb9, 0xf2, 0x1a, 0x3f, 0xdc, 0xd1, + 0xab, 0xa8, 0x8d, 0x3a, 0xf5, 0x67, 0xaa, 0x59, 0x00, 0x36, 0x1d, 0xa1, 0x38, 0xf3, 0x28, 0xef, + 0xf7, 0xec, 0x3a, 0x5c, 0x3f, 0x04, 0xca, 0x4b, 0x7c, 0x0c, 0xd4, 0x1f, 0xbb, 0x34, 0x0e, 0xc8, + 0xcc, 0x05, 0x6f, 0x2c, 0x8c, 0x33, 0x37, 0x12, 0x07, 0xf5, 0x4e, 0x1b, 0x75, 0xaa, 0xf6, 0x91, + 0x10, 0xf4, 0x45, 0xde, 0x11, 0x51, 0x87, 0x0d, 0xc4, 0x8f, 0xa2, 0xe3, 0xfa, 0x7a, 0x42, 0xee, + 0x98, 0xcc, 0xd5, 0x6a, 0x1b, 0x75, 0x0e, 0x6c, 0x0c, 0xd7, 0x60, 0xc6, 0xa2, 0x86, 0x1b, 0x7b, + 0xc4, 0xca, 0x29, 0xae, 0x0a, 0x79, 0x0e, 0xf9, 0x64, 0x07, 0xb2, 0xcc, 0x9e, 0x2d, 0xd4, 0xca, + 0x17, 0x84, 0x9b, 0x9c, 0xa4, 0x84, 0x9f, 0x93, 0x34, 0x67, 0x73, 0x03, 0x12, 0xb3, 0x48, 0x12, + 0x1e, 0x74, 0x9d, 0x45, 0xa6, 0x57, 0x7e, 0x64, 0xfa, 0x91, 0xcf, 0xd2, 0x88, 0xa5, 0x69, 0x30, + 0x36, 0x29, 0xb3, 0x22, 0x0f, 0x46, 0x66, 0x3f, 0x86, 0xdf, 0x99, 0x5e, 0x5a, 0x7c, 0x95, 0xe9, + 0x8f, 0xe7, 0x5e, 0x34, 0x79, 0x65, 0x94, 0x65, 0x0d, 0x5b, 0xd9, 0x84, 0xa5, 0xdf, 0x9e, 0x08, + 0xee, 0x82, 0x40, 0x01, 0xa4, 0x7a, 0x5b, 0x10, 0xf8, 0x2f, 0x08, 0x94, 0x82, 0x38, 0x5b, 0x90, + 0xcf, 0xb8, 0x01, 0x0c, 0xbc, 0xc9, 0xce, 0x34, 0xee, 0x4a, 0x88, 0xf7, 0x37, 0x41, 0xec, 0x57, + 0x5e, 0x65, 0xba, 0x9a, 0x13, 0xec, 0xa5, 0x0c, 0xfb, 0x50, 0xc6, 0x06, 0x25, 0xbd, 0x8b, 0x03, + 0xb8, 0x77, 0xab, 0xde, 0xf0, 0xef, 0xde, 0xb0, 0xdf, 0xbb, 0xe0, 0x7b, 0x80, 0x0f, 0xc9, 0x2c, + 0xa1, 0xdc, 0x03, 0xca, 0x62, 0x57, 0x2c, 0x98, 0x5a, 0x93, 0x57, 0xa9, 0x65, 0xe6, 0xdb, 0x67, + 0x6e, 0xb6, 0xcf, 0x74, 0x36, 0xdb, 0xd7, 0x7d, 0xb0, 0xc8, 0x74, 0x74, 0xf1, 0x53, 0x47, 0xf6, + 0xa3, 0x6d, 0xb1, 0x48, 0x2b, 0x5f, 0x11, 0x6e, 0x26, 0x9c, 0xfa, 0xe4, 0xef, 0xab, 0x7f, 0x5f, + 0xda, 0x49, 0xd7, 0x76, 0x9e, 0x87, 0x14, 0x46, 0xd3, 0xa1, 0xe9, 0xb3, 0xc8, 0x5a, 0xdf, 0xd8, + 0x13, 0xc6, 0xc3, 0xcd, 0xd9, 0x3a, 0x7f, 0x61, 0x4d, 0x81, 0x4e, 0xd2, 0xdc, 0xe9, 0x19, 0x27, + 0x7e, 0x8f, 0xf8, 0xe2, 0x75, 0x97, 0xfd, 0xf7, 0xf6, 0x75, 0x97, 0x65, 0x0d, 0xbb, 0x21, 0xc3, + 0xc5, 0x5d, 0xeb, 0xbe, 0x59, 0x2c, 0x35, 0x74, 0xb9, 0xd4, 0xd0, 0xaf, 0xa5, 0x86, 0x2e, 0x56, + 0x5a, 0xe5, 0x72, 0xa5, 0x55, 0xbe, 0xaf, 0xb4, 0xca, 0xc7, 0x93, 0x9b, 0xc9, 0x66, 0xf9, 0x37, + 0x65, 0x9e, 0x90, 0x74, 0x58, 0x93, 0xd3, 0x39, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0x15, 0x52, + 0xbe, 0xc6, 0xf5, 0x04, 0x00, 0x00, } func (m *LimitOrderTrancheKey) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/limit_order_tranche_key.go b/x/dex/types/limit_order_tranche_key.go index a42e9af16..cb19c1650 100644 --- a/x/dex/types/limit_order_tranche_key.go +++ b/x/dex/types/limit_order_tranche_key.go @@ -1,7 +1,7 @@ package types import ( - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) var _ TickLiquidityKey = (*LimitOrderTrancheKey)(nil) diff --git a/x/dex/types/limit_order_tranche_user.pb.go b/x/dex/types/limit_order_tranche_user.pb.go index 6e52c57d5..d83021acf 100644 --- a/x/dex/types/limit_order_tranche_user.pb.go +++ b/x/dex/types/limit_order_tranche_user.pb.go @@ -116,34 +116,34 @@ var fileDescriptor_67e5ffbd487ea05f = []byte{ // 469 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4d, 0x6b, 0xdb, 0x4e, 0x10, 0xc6, 0xad, 0x7f, 0xf2, 0x4f, 0x9a, 0x55, 0xdf, 0x50, 0x63, 0xba, 0x4d, 0x41, 0x32, 0x3e, - 0x99, 0x42, 0x24, 0x48, 0x7b, 0x28, 0xa1, 0xa7, 0x34, 0x50, 0x4c, 0x53, 0x52, 0x84, 0x4b, 0xa1, - 0x17, 0xb1, 0xd1, 0x0e, 0xd2, 0x62, 0x4b, 0x2b, 0x76, 0xd7, 0xb5, 0xf4, 0x2d, 0xfa, 0xb1, 0x72, - 0xcc, 0xb1, 0xf4, 0x20, 0x5a, 0xfb, 0xd6, 0x63, 0x3e, 0x41, 0x59, 0xeb, 0x05, 0x89, 0x1c, 0x4a, - 0x4f, 0x9a, 0x79, 0x9e, 0x67, 0xe6, 0x27, 0x89, 0x41, 0x2f, 0x52, 0x58, 0x2a, 0xc1, 0x53, 0x8f, - 0x42, 0xee, 0x2d, 0x58, 0xc2, 0x54, 0xc0, 0x05, 0x05, 0x11, 0x28, 0x41, 0xd2, 0x30, 0x86, 0x60, - 0x29, 0x41, 0xb8, 0x99, 0xe0, 0x8a, 0x5b, 0x66, 0x9d, 0x75, 0x29, 0xe4, 0x47, 0x87, 0x11, 0x8f, - 0xf8, 0x56, 0xf7, 0x74, 0x55, 0x45, 0x8e, 0x9c, 0xee, 0x3a, 0x25, 0x08, 0x85, 0x20, 0x23, 0x4c, - 0x04, 0x8c, 0xd6, 0x81, 0xc3, 0x5e, 0x20, 0xaf, 0xd4, 0xf1, 0xaf, 0x5d, 0x34, 0xbc, 0xd0, 0xf0, - 0x4b, 0xcd, 0x9e, 0x55, 0xe8, 0x4f, 0x12, 0x84, 0xf5, 0x06, 0x3d, 0xe8, 0xad, 0xc1, 0xc6, 0xc8, - 0x98, 0x98, 0x27, 0xd8, 0xed, 0xbc, 0x8b, 0x3b, 0xd3, 0x89, 0x8f, 0x84, 0x89, 0xe9, 0xb9, 0x6f, - 0xaa, 0xb6, 0xa1, 0xd6, 0x6b, 0xf4, 0x4c, 0xb1, 0x70, 0x1e, 0xb0, 0x94, 0x42, 0x1e, 0x28, 0x32, - 0xd7, 0x1f, 0xc6, 0x83, 0x44, 0x17, 0xf8, 0xbf, 0x91, 0x31, 0xd9, 0xf1, 0x87, 0x3a, 0x30, 0xd5, - 0xfe, 0x4c, 0xab, 0x33, 0xfe, 0x41, 0x3f, 0x2c, 0x07, 0x99, 0xcd, 0x1f, 0x98, 0x43, 0x81, 0x77, - 0x46, 0xc6, 0xe4, 0xc0, 0x47, 0xb5, 0xf4, 0x1e, 0x0a, 0x0b, 0xa3, 0x7d, 0x42, 0xa9, 0x00, 0x29, - 0xf1, 0xee, 0xd6, 0x6c, 0x5a, 0x2b, 0x42, 0xf7, 0x65, 0x4c, 0x04, 0xc8, 0x80, 0xaf, 0x52, 0xa0, - 0xf8, 0x7f, 0x6d, 0x9f, 0x9d, 0x5f, 0x97, 0xce, 0xe0, 0x47, 0xe9, 0x0c, 0x43, 0x2e, 0x13, 0x2e, - 0x25, 0x9d, 0xbb, 0x8c, 0x7b, 0x09, 0x51, 0xb1, 0x3b, 0x4d, 0xd5, 0xef, 0xd2, 0xe9, 0x0d, 0xdd, - 0x96, 0xce, 0x93, 0x82, 0x24, 0x8b, 0xd3, 0x71, 0x57, 0x1d, 0xfb, 0x66, 0xd5, 0x5e, 0xea, 0xce, - 0x5a, 0xa1, 0xc7, 0xb5, 0xbb, 0x62, 0x2a, 0xa6, 0x82, 0xac, 0x52, 0xbc, 0xb7, 0x85, 0x5d, 0xfc, - 0x0d, 0x76, 0x67, 0xf0, 0xb6, 0x74, 0x9e, 0xf6, 0x80, 0xad, 0x33, 0xf6, 0x1f, 0x55, 0xd2, 0xe7, - 0x46, 0xe9, 0x80, 0x43, 0x92, 0x86, 0xb0, 0x58, 0x00, 0xc5, 0xfb, 0xff, 0x06, 0x6e, 0x07, 0xef, - 0x80, 0x5b, 0xa7, 0x05, 0xbf, 0x6d, 0x14, 0xeb, 0x14, 0xa1, 0xfa, 0x3a, 0x8b, 0x0c, 0xf0, 0xbd, - 0x91, 0x31, 0x79, 0x78, 0xf2, 0xbc, 0x77, 0x0a, 0x9d, 0x2b, 0x2a, 0x32, 0xf0, 0x0f, 0x78, 0x53, - 0x9e, 0xbd, 0xbb, 0x5e, 0xdb, 0xc6, 0xcd, 0xda, 0x36, 0x7e, 0xae, 0x6d, 0xe3, 0xdb, 0xc6, 0x1e, - 0xdc, 0x6c, 0xec, 0xc1, 0xf7, 0x8d, 0x3d, 0xf8, 0x72, 0x1c, 0x31, 0x15, 0x2f, 0xaf, 0xdc, 0x90, - 0x27, 0x5e, 0xbd, 0xeb, 0x98, 0x8b, 0xa8, 0xa9, 0xbd, 0xaf, 0xaf, 0xbc, 0xbc, 0xba, 0xd7, 0x22, - 0x03, 0x79, 0xb5, 0xb7, 0xbd, 0xd9, 0x97, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x41, 0xf7, - 0x93, 0x3b, 0x03, 0x00, 0x00, + 0x99, 0x42, 0x24, 0x48, 0x29, 0x94, 0xd0, 0x53, 0x1a, 0x28, 0xa6, 0x29, 0x29, 0xc2, 0xa5, 0xd0, + 0x8b, 0xd8, 0x68, 0x07, 0x69, 0xb1, 0xa5, 0x15, 0xbb, 0xeb, 0x5a, 0xfa, 0x16, 0xfd, 0x58, 0x39, + 0xe6, 0x58, 0x7a, 0x10, 0xad, 0x7d, 0xeb, 0x31, 0x9f, 0xa0, 0xac, 0xf5, 0x82, 0x44, 0x0e, 0xa5, + 0x27, 0xcd, 0x3c, 0xcf, 0x33, 0xf3, 0x93, 0xc4, 0xa0, 0x17, 0x29, 0x2c, 0x95, 0xe0, 0xa9, 0x47, + 0x21, 0xf7, 0x16, 0x2c, 0x61, 0x2a, 0xe0, 0x82, 0x82, 0x08, 0x94, 0x20, 0x69, 0x18, 0x43, 0xb0, + 0x94, 0x20, 0xdc, 0x4c, 0x70, 0xc5, 0x2d, 0xb3, 0xce, 0xba, 0x14, 0xf2, 0xa3, 0xc3, 0x88, 0x47, + 0x7c, 0xab, 0x7b, 0xba, 0xaa, 0x22, 0x47, 0x4e, 0x77, 0x9d, 0x12, 0x84, 0x42, 0x90, 0x11, 0x26, + 0x02, 0x46, 0xeb, 0xc0, 0x61, 0x2f, 0x90, 0x57, 0xea, 0xf8, 0xd7, 0x2e, 0x1a, 0x5e, 0x68, 0xf8, + 0xa5, 0x66, 0xcf, 0x2a, 0xf4, 0x27, 0x09, 0xc2, 0x7a, 0x83, 0x1e, 0xf4, 0xd6, 0x60, 0x63, 0x64, + 0x4c, 0xcc, 0x13, 0xec, 0x76, 0xde, 0xc5, 0x9d, 0xe9, 0xc4, 0x47, 0xc2, 0xc4, 0xf4, 0xdc, 0x37, + 0x55, 0xdb, 0x50, 0xeb, 0x35, 0x7a, 0xa6, 0x58, 0x38, 0x0f, 0x58, 0x4a, 0x21, 0x0f, 0x14, 0x99, + 0xeb, 0x0f, 0xe3, 0x41, 0xa2, 0x0b, 0xfc, 0xdf, 0xc8, 0x98, 0xec, 0xf8, 0x43, 0x1d, 0x98, 0x6a, + 0x7f, 0xa6, 0xd5, 0x19, 0xff, 0xa0, 0x1f, 0x96, 0x83, 0xcc, 0xe6, 0x0f, 0xcc, 0xa1, 0xc0, 0x3b, + 0x23, 0x63, 0x72, 0xe0, 0xa3, 0x5a, 0x7a, 0x0f, 0x85, 0x85, 0xd1, 0x3e, 0xa1, 0x54, 0x80, 0x94, + 0x78, 0x77, 0x6b, 0x36, 0xad, 0x15, 0xa1, 0xfb, 0x32, 0x26, 0x02, 0x64, 0xc0, 0x57, 0x29, 0x50, + 0xfc, 0xbf, 0xb6, 0xcf, 0xce, 0xaf, 0x4b, 0x67, 0xf0, 0xa3, 0x74, 0x86, 0x21, 0x97, 0x09, 0x97, + 0x92, 0xce, 0x5d, 0xc6, 0xbd, 0x84, 0xa8, 0xd8, 0x9d, 0xa6, 0xea, 0x77, 0xe9, 0xf4, 0x86, 0x6e, + 0x4b, 0xe7, 0x49, 0x41, 0x92, 0xc5, 0xe9, 0xb8, 0xab, 0x8e, 0x7d, 0xb3, 0x6a, 0x2f, 0x75, 0x67, + 0xad, 0xd0, 0xe3, 0xda, 0x5d, 0x31, 0x15, 0x53, 0x41, 0x56, 0x29, 0xde, 0xdb, 0xc2, 0x2e, 0xfe, + 0x06, 0xbb, 0x33, 0x78, 0x5b, 0x3a, 0x4f, 0x7b, 0xc0, 0xd6, 0x19, 0xfb, 0x8f, 0x2a, 0xe9, 0x73, + 0xa3, 0x74, 0xc0, 0x21, 0x49, 0x43, 0x58, 0x2c, 0x80, 0xe2, 0xfd, 0x7f, 0x03, 0xb7, 0x83, 0x77, + 0xc0, 0xad, 0xd3, 0x82, 0xdf, 0x36, 0x8a, 0x75, 0x8a, 0x50, 0x7d, 0x9d, 0x45, 0x06, 0xf8, 0xde, + 0xc8, 0x98, 0x3c, 0x3c, 0x79, 0xde, 0x3b, 0x85, 0xce, 0x15, 0x15, 0x19, 0xf8, 0x07, 0xbc, 0x29, + 0xcf, 0xde, 0x5d, 0xaf, 0x6d, 0xe3, 0x66, 0x6d, 0x1b, 0x3f, 0xd7, 0xb6, 0xf1, 0x6d, 0x63, 0x0f, + 0x6e, 0x36, 0xf6, 0xe0, 0xfb, 0xc6, 0x1e, 0x7c, 0x39, 0x8e, 0x98, 0x8a, 0x97, 0x57, 0x6e, 0xc8, + 0x13, 0xaf, 0xde, 0x75, 0xcc, 0x45, 0xd4, 0xd4, 0xde, 0xd7, 0x57, 0x5e, 0x5e, 0xdd, 0x6b, 0x91, + 0x81, 0xbc, 0xda, 0xdb, 0xde, 0xec, 0xcb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xc2, 0x2d, + 0x0c, 0x3b, 0x03, 0x00, 0x00, } func (m *LimitOrderTrancheUser) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/liquidity.go b/x/dex/types/liquidity.go index aced7919c..97f6f9bd1 100644 --- a/x/dex/types/liquidity.go +++ b/x/dex/types/liquidity.go @@ -3,7 +3,7 @@ package types import ( "cosmossdk.io/math" - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) type Liquidity interface { diff --git a/x/dex/types/message_multi_hop_swap.go b/x/dex/types/message_multi_hop_swap.go index 416260d5c..57ffb4f65 100644 --- a/x/dex/types/message_multi_hop_swap.go +++ b/x/dex/types/message_multi_hop_swap.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) const TypeMsgMultiHopSwap = "multi_hop_swap" diff --git a/x/dex/types/message_place_limit_order.go b/x/dex/types/message_place_limit_order.go index 47206d49c..2ada309d7 100644 --- a/x/dex/types/message_place_limit_order.go +++ b/x/dex/types/message_place_limit_order.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) const TypeMsgPlaceLimitOrder = "place_limit_order" diff --git a/x/dex/types/pair_id.go b/x/dex/types/pair_id.go index dd2b9b9e6..4809e7e38 100644 --- a/x/dex/types/pair_id.go +++ b/x/dex/types/pair_id.go @@ -7,7 +7,8 @@ import ( sdkerrors "cosmossdk.io/errors" ) -func NewPairID(token0, token1 string) (*PairID, error) { +func NewPairID(tokenA, tokenB string) (*PairID, error) { + token0, token1 := SortTokens(tokenA, tokenB) if token0 == token1 { return nil, sdkerrors.Wrapf(ErrInvalidTradingPair, "%s<>%s", token0, token1) } @@ -17,19 +18,14 @@ func NewPairID(token0, token1 string) (*PairID, error) { }, nil } -func MustNewPairID(token0, token1 string) *PairID { - pairID, err := NewPairID(token0, token1) +func MustNewPairID(tokenA, tokenB string) *PairID { + pairID, err := NewPairID(tokenA, tokenB) if err != nil { panic(err) } return pairID } -func NewPairIDFromUnsorted(tokenA, tokenB string) (*PairID, error) { - token0, token1 := SortTokens(tokenA, tokenB) - return NewPairID(token0, token1) -} - func (p *PairID) CanonicalString() string { return fmt.Sprintf("%s<>%s", p.Token0, p.Token1) } diff --git a/x/dex/types/pair_id.pb.go b/x/dex/types/pair_id.pb.go index 1b97bd856..d42c49e72 100644 --- a/x/dex/types/pair_id.pb.go +++ b/x/dex/types/pair_id.pb.go @@ -90,8 +90,8 @@ var fileDescriptor_7bd5bf8f218c5bfa = []byte{ 0x71, 0x43, 0x27, 0xf7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0xda, 0xa5, 0x9b, 0x5f, 0x94, - 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xe8, 0x57, 0x80, 0xdd, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, - 0x06, 0x76, 0x96, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xb4, 0x18, 0xd2, 0xb3, 0x00, 0x00, + 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x80, 0xdd, 0x55, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, + 0x06, 0x76, 0x96, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x02, 0x37, 0xc2, 0x4d, 0xb3, 0x00, 0x00, 0x00, } diff --git a/x/dex/types/params.pb.go b/x/dex/types/params.pb.go index ca28efd3e..8821ec7dd 100644 --- a/x/dex/types/params.pb.go +++ b/x/dex/types/params.pb.go @@ -101,7 +101,7 @@ var fileDescriptor_84a6bffcfc21009c = []byte{ // 290 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x34, 0x90, 0x31, 0x4b, 0x03, 0x31, 0x14, 0xc7, 0x2f, 0xf4, 0x2c, 0x35, 0x0e, 0x42, 0x50, 0x08, 0x0a, 0x69, 0xe9, 0x54, 0x90, 0x36, - 0x83, 0x82, 0xe0, 0x66, 0x17, 0xc1, 0xa9, 0x94, 0x4e, 0x2e, 0x21, 0xed, 0xbd, 0xc6, 0xe8, 0x5d, + 0x83, 0x88, 0xe0, 0x66, 0x17, 0xc1, 0xa9, 0x94, 0x4e, 0x2e, 0x21, 0xed, 0xbd, 0xc6, 0xe8, 0x5d, 0x13, 0x92, 0x9c, 0x9e, 0xdf, 0xc2, 0xd1, 0xd1, 0x2f, 0xe1, 0x77, 0x70, 0xec, 0xe8, 0x24, 0x72, 0xb7, 0xf9, 0x29, 0xe4, 0xce, 0xeb, 0xf4, 0xfe, 0xef, 0xff, 0x7b, 0xff, 0xe1, 0xfd, 0x31, 0xdd, 0x40, 0x1e, 0x9c, 0xd9, 0xf0, 0x04, 0x0a, 0x6e, 0xa5, 0x93, 0x99, 0x9f, 0x58, 0x67, 0x82, 0x21, @@ -116,7 +116,7 @@ var fileDescriptor_84a6bffcfc21009c = []byte{ 0x3f, 0x9a, 0xde, 0x7c, 0x96, 0x0c, 0x6d, 0x4b, 0x86, 0x7e, 0x4a, 0x86, 0x5e, 0x2b, 0x16, 0x6d, 0x2b, 0x16, 0x7d, 0x55, 0x2c, 0xba, 0x1b, 0x2b, 0x1d, 0xee, 0xf3, 0xe5, 0x64, 0x65, 0x32, 0xde, 0xfe, 0x3f, 0x36, 0x4e, 0xed, 0x34, 0x7f, 0xba, 0xe0, 0x45, 0x53, 0x55, 0x78, 0xb1, 0xe0, 0x97, - 0xdd, 0xa6, 0x87, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x58, 0x59, 0xc8, 0x6a, 0x46, 0x01, + 0xdd, 0xa6, 0x87, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc6, 0xda, 0x12, 0xf5, 0x46, 0x01, 0x00, 0x00, } diff --git a/x/dex/types/pool.go b/x/dex/types/pool.go index 3a167f5b4..96a717eac 100644 --- a/x/dex/types/pool.go +++ b/x/dex/types/pool.go @@ -4,8 +4,8 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/utils" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) func NewPool( diff --git a/x/dex/types/pool.pb.go b/x/dex/types/pool.pb.go index 7468d843b..b80290012 100644 --- a/x/dex/types/pool.pb.go +++ b/x/dex/types/pool.pb.go @@ -103,9 +103,9 @@ var fileDescriptor_6ad7a9165eac1fde = []byte{ 0x26, 0xa8, 0x17, 0xac, 0x1a, 0xa4, 0xd7, 0xd0, 0xc9, 0xfd, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, - 0xa1, 0x46, 0xe9, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0x26, 0xfa, 0x15, 0x60, 0x7f, 0x96, - 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x3d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xa3, - 0xc3, 0x63, 0x5c, 0x3e, 0x01, 0x00, 0x00, + 0xa1, 0x46, 0xe9, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0x60, 0x7f, 0x96, + 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x3d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x3d, + 0x40, 0xb9, 0xc3, 0x3e, 0x01, 0x00, 0x00, } func (m *Pool) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pool_denom_test.go b/x/dex/types/pool_denom_test.go index 713e5f42e..fc511a8b8 100644 --- a/x/dex/types/pool_denom_test.go +++ b/x/dex/types/pool_denom_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestValidatePoolDenom(t *testing.T) { diff --git a/x/dex/types/pool_liquidity.go b/x/dex/types/pool_liquidity.go index 9310826f3..1e3ddc253 100644 --- a/x/dex/types/pool_liquidity.go +++ b/x/dex/types/pool_liquidity.go @@ -3,7 +3,7 @@ package types import ( "cosmossdk.io/math" - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) type PoolLiquidity struct { diff --git a/x/dex/types/pool_metadata.pb.go b/x/dex/types/pool_metadata.pb.go index 47c15c2ae..cc8b75705 100644 --- a/x/dex/types/pool_metadata.pb.go +++ b/x/dex/types/pool_metadata.pb.go @@ -110,9 +110,9 @@ var fileDescriptor_c2ee8eaeac9c06d8 = []byte{ 0x09, 0x62, 0x03, 0xa9, 0xf1, 0x4c, 0x71, 0x72, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xdd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, - 0x01, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0x89, 0x7e, 0x05, 0xd8, 0x13, 0x25, 0x95, - 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x3f, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x55, - 0x5b, 0x6e, 0x0e, 0x01, 0x00, 0x00, + 0x01, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0xd8, 0x13, 0x25, 0x95, + 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x3f, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4e, 0xd6, + 0x81, 0xf1, 0x0e, 0x01, 0x00, 0x00, } func (m *PoolMetadata) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pool_reserves.pb.go b/x/dex/types/pool_reserves.pb.go index 10e0f6d50..2cafc125e 100644 --- a/x/dex/types/pool_reserves.pb.go +++ b/x/dex/types/pool_reserves.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + github_com_neutron_org_neutron_v5_utils_math "github.com/neutron-org/neutron/v5/utils/math" io "io" math "math" math_bits "math/bits" @@ -88,8 +88,8 @@ func (m *PoolReservesKey) GetFee() uint64 { type PoolReserves struct { Key *PoolReservesKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` ReservesMakerDenom cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=reserves_maker_denom,json=reservesMakerDenom,proto3,customtype=cosmossdk.io/math.Int" json:"reserves_maker_denom" yaml:"reserves_maker_denom"` - PriceTakerToMaker github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,3,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"price_taker_to_maker" yaml:"price_taker_to_maker"` - PriceOppositeTakerToMaker github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,4,opt,name=price_opposite_taker_to_maker,json=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"price_opposite_taker_to_maker" yaml:"price_opposite_taker_to_maker"` + PriceTakerToMaker github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,3,opt,name=price_taker_to_maker,json=priceTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"price_taker_to_maker" yaml:"price_taker_to_maker"` + PriceOppositeTakerToMaker github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,4,opt,name=price_opposite_taker_to_maker,json=priceOppositeTakerToMaker,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"price_opposite_taker_to_maker" yaml:"price_opposite_taker_to_maker"` } func (m *PoolReserves) Reset() { *m = PoolReserves{} } @@ -141,35 +141,35 @@ func init() { proto.RegisterFile("neutron/dex/pool_reserves.proto", fileDescript var fileDescriptor_f0fe9f734c7ad538 = []byte{ // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x3b, 0xa6, 0x08, 0x4e, 0x15, 0x35, 0x74, 0xa1, 0xbb, 0x6a, 0x52, 0x82, 0x87, 0x5e, - 0x36, 0x01, 0xdd, 0x83, 0x88, 0xa7, 0xa5, 0x20, 0x45, 0xc4, 0x12, 0x7a, 0xf2, 0x12, 0xb2, 0x99, - 0x67, 0x77, 0x68, 0x93, 0x17, 0x66, 0xa6, 0x4b, 0xfb, 0x01, 0xf4, 0xec, 0xdd, 0xab, 0x5f, 0xc2, - 0x6f, 0xd0, 0xe3, 0x1e, 0xc5, 0x43, 0x90, 0xf6, 0xe6, 0x71, 0x3f, 0x81, 0xcc, 0x24, 0xd5, 0xb6, - 0x46, 0x3d, 0xec, 0x29, 0x2f, 0xff, 0xff, 0x3f, 0x6f, 0x7e, 0x6f, 0xc2, 0xa3, 0x6e, 0x06, 0x33, - 0x25, 0x30, 0x0b, 0x18, 0xcc, 0x83, 0x1c, 0x71, 0x1a, 0x09, 0x90, 0x20, 0x2e, 0x40, 0xfa, 0xb9, - 0x40, 0x85, 0x76, 0xab, 0x0a, 0xf8, 0x0c, 0xe6, 0x47, 0xed, 0x31, 0x8e, 0xd1, 0xe8, 0x81, 0xae, - 0xca, 0xc8, 0xd1, 0x4e, 0x0f, 0x25, 0x62, 0x06, 0x51, 0x1e, 0x73, 0x11, 0x71, 0x56, 0x06, 0xbc, - 0x4f, 0x84, 0xde, 0x1d, 0x22, 0x4e, 0xc3, 0xaa, 0xf5, 0x2b, 0x58, 0xd8, 0x2f, 0xe8, 0x9d, 0x9d, - 0x68, 0x87, 0x74, 0x49, 0xaf, 0xf5, 0xa4, 0xe3, 0x6f, 0x9d, 0xe7, 0x8f, 0x74, 0x62, 0x18, 0x73, - 0x31, 0xe8, 0x87, 0x2d, 0xf5, 0xeb, 0x85, 0xd9, 0xcf, 0xe8, 0xa1, 0xe2, 0xc9, 0x24, 0xe2, 0x19, - 0x83, 0x79, 0xa4, 0xe2, 0x09, 0x88, 0x48, 0x61, 0x94, 0xea, 0xa2, 0x73, 0xa3, 0x4b, 0x7a, 0x56, - 0x78, 0xa0, 0x03, 0x03, 0xed, 0x8f, 0xb4, 0x3a, 0xc2, 0xd7, 0xfa, 0x61, 0xdf, 0xa3, 0xd6, 0x3b, - 0x80, 0x8e, 0xd5, 0x25, 0xbd, 0x66, 0xa8, 0x4b, 0xef, 0x4b, 0x93, 0xde, 0xde, 0xa6, 0xb3, 0x7d, - 0x6a, 0x4d, 0x60, 0x51, 0x01, 0x3d, 0xdc, 0x01, 0xda, 0x9b, 0x22, 0xd4, 0x41, 0xfb, 0x03, 0xa1, - 0xed, 0xcd, 0xad, 0x95, 0x08, 0x11, 0x83, 0x0c, 0x53, 0x03, 0x72, 0xeb, 0x74, 0xb4, 0x2c, 0xdc, - 0xc6, 0xb7, 0xc2, 0x3d, 0x48, 0x50, 0xa6, 0x28, 0x25, 0x9b, 0xf8, 0x1c, 0x83, 0x34, 0x56, 0xe7, - 0xfe, 0x20, 0x53, 0x3f, 0x0a, 0xb7, 0xf6, 0xe3, 0xab, 0xc2, 0x7d, 0xb0, 0x88, 0xd3, 0xe9, 0x73, - 0xaf, 0xce, 0xf5, 0x42, 0x7b, 0x23, 0x9b, 0xb1, 0xfa, 0x5a, 0xb4, 0x3f, 0x13, 0xda, 0xce, 0x05, - 0x4f, 0x60, 0xff, 0x46, 0x2c, 0x03, 0x22, 0x2b, 0x90, 0x93, 0x31, 0x57, 0xe7, 0xb3, 0x33, 0x3f, - 0xc1, 0x34, 0xa8, 0x86, 0x3b, 0x46, 0x31, 0xde, 0xd4, 0xc1, 0xc5, 0x49, 0x30, 0x53, 0x7c, 0x2a, - 0x4b, 0xc6, 0xa1, 0x80, 0xa4, 0x0f, 0x89, 0xe6, 0xac, 0xeb, 0xfd, 0x9b, 0xb3, 0xce, 0xf5, 0xc2, - 0xfb, 0x46, 0xde, 0xf9, 0x05, 0x4b, 0x42, 0x1f, 0x95, 0x61, 0xcc, 0x73, 0x94, 0x5c, 0xfd, 0xc1, - 0xdb, 0x34, 0xbc, 0xef, 0xc9, 0x35, 0x81, 0xff, 0x7d, 0xca, 0x55, 0xe1, 0x3e, 0xde, 0x26, 0xff, - 0x4b, 0xcc, 0x0b, 0x0f, 0x8d, 0xff, 0xa6, 0xb2, 0xb7, 0x47, 0x39, 0x7d, 0xb9, 0x5c, 0x39, 0xe4, - 0x72, 0xe5, 0x90, 0xef, 0x2b, 0x87, 0x7c, 0x5c, 0x3b, 0x8d, 0xcb, 0xb5, 0xd3, 0xf8, 0xba, 0x76, - 0x1a, 0x6f, 0x8f, 0xff, 0xcf, 0x3c, 0x2f, 0x17, 0x66, 0x91, 0x83, 0x3c, 0xbb, 0x69, 0x36, 0xe5, - 0xe9, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x64, 0x59, 0x2e, 0x90, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x4f, 0x8b, 0xd3, 0x40, + 0x18, 0xc6, 0x3b, 0xa6, 0x08, 0x4e, 0x15, 0x35, 0x74, 0xa1, 0xbb, 0x6a, 0x52, 0x82, 0x87, 0x5e, + 0x36, 0x01, 0xff, 0x80, 0x88, 0xa7, 0xa5, 0x20, 0x45, 0xc4, 0x12, 0x7a, 0xf2, 0x12, 0xb2, 0x99, + 0xd7, 0xee, 0xd0, 0x26, 0x6f, 0x98, 0x99, 0x2e, 0xed, 0x07, 0xd0, 0xb3, 0x77, 0xaf, 0x7e, 0x09, + 0xbf, 0x41, 0x8f, 0x7b, 0x14, 0x0f, 0x41, 0xda, 0x9b, 0xc7, 0xfd, 0x04, 0x32, 0x93, 0x54, 0xdb, + 0x1a, 0xf5, 0xb0, 0xa7, 0xbc, 0x79, 0x9e, 0x27, 0xef, 0xfc, 0xde, 0x09, 0x2f, 0x75, 0x33, 0x98, + 0x29, 0x81, 0x59, 0xc0, 0x60, 0x1e, 0xe4, 0x88, 0xd3, 0x48, 0x80, 0x04, 0x71, 0x0e, 0xd2, 0xcf, + 0x05, 0x2a, 0xb4, 0x5b, 0x55, 0xc0, 0x67, 0x30, 0x3f, 0x6a, 0x8f, 0x71, 0x8c, 0x46, 0x0f, 0x74, + 0x55, 0x46, 0x8e, 0x76, 0x7a, 0x28, 0x11, 0x33, 0x88, 0xf2, 0x98, 0x8b, 0x88, 0xb3, 0x32, 0xe0, + 0x7d, 0x22, 0xf4, 0xf6, 0x10, 0x71, 0x1a, 0x56, 0xad, 0x5f, 0xc1, 0xc2, 0x7e, 0x41, 0x6f, 0xed, + 0x44, 0x3b, 0xa4, 0x4b, 0x7a, 0xad, 0x47, 0x1d, 0x7f, 0xeb, 0x3c, 0x7f, 0xa4, 0x13, 0xc3, 0x98, + 0x8b, 0x41, 0x3f, 0x6c, 0xa9, 0x5f, 0x2f, 0xcc, 0x7e, 0x46, 0x0f, 0x15, 0x4f, 0x26, 0x11, 0xcf, + 0x18, 0xcc, 0x23, 0x15, 0x4f, 0x40, 0x44, 0x0a, 0xa3, 0x54, 0x17, 0x9d, 0x6b, 0x5d, 0xd2, 0xb3, + 0xc2, 0x03, 0x1d, 0x18, 0x68, 0x7f, 0xa4, 0xd5, 0x11, 0xbe, 0xd6, 0x0f, 0xfb, 0x0e, 0xb5, 0xde, + 0x01, 0x74, 0xac, 0x2e, 0xe9, 0x35, 0x43, 0x5d, 0x7a, 0x5f, 0x9a, 0xf4, 0xe6, 0x36, 0x9d, 0xed, + 0x53, 0x6b, 0x02, 0x8b, 0x0a, 0xe8, 0xfe, 0x0e, 0xd0, 0xde, 0x14, 0xa1, 0x0e, 0xda, 0x1f, 0x08, + 0x6d, 0x6f, 0x6e, 0xad, 0x44, 0x88, 0x18, 0x64, 0x98, 0x1a, 0x90, 0x1b, 0x27, 0xa3, 0x65, 0xe1, + 0x36, 0xbe, 0x15, 0xee, 0x41, 0x82, 0x32, 0x45, 0x29, 0xd9, 0xc4, 0xe7, 0x18, 0xa4, 0xb1, 0x3a, + 0xf3, 0x07, 0x99, 0xfa, 0x51, 0xb8, 0xb5, 0x1f, 0x5f, 0x16, 0xee, 0xbd, 0x45, 0x9c, 0x4e, 0x9f, + 0x7b, 0x75, 0xae, 0x17, 0xda, 0x1b, 0xd9, 0x8c, 0xd5, 0xd7, 0xa2, 0xfd, 0x99, 0xd0, 0x76, 0x2e, + 0x78, 0x02, 0xfb, 0x37, 0x62, 0x19, 0x10, 0x59, 0x81, 0x3c, 0x19, 0x73, 0x75, 0x36, 0x3b, 0xf5, + 0x13, 0x4c, 0x83, 0x6a, 0xb8, 0x63, 0x14, 0xe3, 0x4d, 0x1d, 0x9c, 0x3f, 0x0d, 0x66, 0x8a, 0x4f, + 0x65, 0xc9, 0x38, 0x14, 0x90, 0xf4, 0x21, 0xd1, 0x9c, 0x75, 0xbd, 0x7f, 0x73, 0xd6, 0xb9, 0x5e, + 0x78, 0xd7, 0xc8, 0x3b, 0xbf, 0x60, 0x49, 0xe8, 0x83, 0x32, 0x8c, 0x79, 0x8e, 0x92, 0xab, 0x3f, + 0x78, 0x9b, 0x86, 0xf7, 0x3d, 0xb9, 0x22, 0xf0, 0xbf, 0x4f, 0xb9, 0x2c, 0xdc, 0x87, 0xdb, 0xe4, + 0x7f, 0x89, 0x79, 0xe1, 0xa1, 0xf1, 0xdf, 0x54, 0xf6, 0xf6, 0x28, 0x27, 0x2f, 0x97, 0x2b, 0x87, + 0x5c, 0xac, 0x1c, 0xf2, 0x7d, 0xe5, 0x90, 0x8f, 0x6b, 0xa7, 0x71, 0xb1, 0x76, 0x1a, 0x5f, 0xd7, + 0x4e, 0xe3, 0xed, 0xf1, 0xff, 0x99, 0xe7, 0xe5, 0xc2, 0x2c, 0x72, 0x90, 0xa7, 0xd7, 0xcd, 0xa6, + 0x3c, 0xfe, 0x19, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xc4, 0x40, 0x24, 0x90, 0x03, 0x00, 0x00, } func (m *PoolReservesKey) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/pool_reserves_key.go b/x/dex/types/pool_reserves_key.go index b331b6dd4..bb1f7a9c9 100644 --- a/x/dex/types/pool_reserves_key.go +++ b/x/dex/types/pool_reserves_key.go @@ -3,8 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/utils" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) var _ TickLiquidityKey = (*PoolReservesKey)(nil) diff --git a/x/dex/types/pool_test.go b/x/dex/types/pool_test.go index 6e339d212..77ed9e083 100644 --- a/x/dex/types/pool_test.go +++ b/x/dex/types/pool_test.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/assert" - dextypes "github.com/neutron-org/neutron/v4/x/dex/types" + dextypes "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestCalcGreatestMatchingRatioBothReservesNonZero(t *testing.T) { diff --git a/x/dex/types/price.go b/x/dex/types/price.go index 72686a6a1..2feafece6 100644 --- a/x/dex/types/price.go +++ b/x/dex/types/price.go @@ -9,8 +9,8 @@ import ( "cosmossdk.io/errors" "cosmossdk.io/math" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/utils" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) const ( diff --git a/x/dex/types/price_test.go b/x/dex/types/price_test.go index 63145bf72..86b1c9c32 100644 --- a/x/dex/types/price_test.go +++ b/x/dex/types/price_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestCalcTickIndexFromPrice(t *testing.T) { diff --git a/x/dex/types/query.pb.go b/x/dex/types/query.pb.go index 9450a4a07..e6fddf00e 100644 --- a/x/dex/types/query.pb.go +++ b/x/dex/types/query.pb.go @@ -14,7 +14,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + github_com_neutron_org_neutron_v5_utils_math "github.com/neutron-org/neutron/v5/utils/math" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1327,11 +1327,12 @@ func (m *QueryGetPoolReservesResponse) GetPoolReserves() *PoolReserves { } type QueryEstimateMultiHopSwapRequest struct { + // DEPRECATED: Use QuerySimulateMultiHopSwap Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` Routes []*MultiHopRoute `protobuf:"bytes,3,rep,name=routes,proto3" json:"routes,omitempty"` AmountIn cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=cosmossdk.io/math.Int" json:"amount_in" yaml:"amount_in"` - ExitLimitPrice github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"exit_limit_price" yaml:"exit_limit_price"` + ExitLimitPrice github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"exit_limit_price" yaml:"exit_limit_price"` // If pickBestRoute == true then all routes are run and the route with the // best price is chosen otherwise, the first succesful route is used. PickBestRoute bool `protobuf:"varint,6,opt,name=pick_best_route,json=pickBestRoute,proto3" json:"pick_best_route,omitempty"` @@ -1436,6 +1437,7 @@ func (m *QueryEstimateMultiHopSwapResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryEstimateMultiHopSwapResponse proto.InternalMessageInfo type QueryEstimatePlaceLimitOrderRequest struct { + // DEPRECATED: Use QuerySimulatePlaceLimitOrder Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty"` @@ -1909,1395 +1911,1731 @@ func (m *QueryAllPoolMetadataResponse) GetPagination() *query.PageResponse { return nil } -func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "neutron.dex.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "neutron.dex.QueryParamsResponse") - proto.RegisterType((*QueryGetLimitOrderTrancheUserRequest)(nil), "neutron.dex.QueryGetLimitOrderTrancheUserRequest") - proto.RegisterType((*QueryGetLimitOrderTrancheUserResponse)(nil), "neutron.dex.QueryGetLimitOrderTrancheUserResponse") - proto.RegisterType((*QueryAllLimitOrderTrancheUserRequest)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserRequest") - proto.RegisterType((*QueryAllLimitOrderTrancheUserResponse)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserResponse") - proto.RegisterType((*QueryGetLimitOrderTrancheRequest)(nil), "neutron.dex.QueryGetLimitOrderTrancheRequest") - proto.RegisterType((*QueryGetLimitOrderTrancheResponse)(nil), "neutron.dex.QueryGetLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllLimitOrderTrancheRequest)(nil), "neutron.dex.QueryAllLimitOrderTrancheRequest") - proto.RegisterType((*QueryAllLimitOrderTrancheResponse)(nil), "neutron.dex.QueryAllLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllUserDepositsRequest)(nil), "neutron.dex.QueryAllUserDepositsRequest") - proto.RegisterType((*QueryAllUserDepositsResponse)(nil), "neutron.dex.QueryAllUserDepositsResponse") - proto.RegisterType((*QueryAllLimitOrderTrancheUserByAddressRequest)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserByAddressRequest") - proto.RegisterType((*QueryAllLimitOrderTrancheUserByAddressResponse)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserByAddressResponse") - proto.RegisterType((*QueryAllTickLiquidityRequest)(nil), "neutron.dex.QueryAllTickLiquidityRequest") - proto.RegisterType((*QueryAllTickLiquidityResponse)(nil), "neutron.dex.QueryAllTickLiquidityResponse") - proto.RegisterType((*QueryGetInactiveLimitOrderTrancheRequest)(nil), "neutron.dex.QueryGetInactiveLimitOrderTrancheRequest") - proto.RegisterType((*QueryGetInactiveLimitOrderTrancheResponse)(nil), "neutron.dex.QueryGetInactiveLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllInactiveLimitOrderTrancheRequest)(nil), "neutron.dex.QueryAllInactiveLimitOrderTrancheRequest") - proto.RegisterType((*QueryAllInactiveLimitOrderTrancheResponse)(nil), "neutron.dex.QueryAllInactiveLimitOrderTrancheResponse") - proto.RegisterType((*QueryAllPoolReservesRequest)(nil), "neutron.dex.QueryAllPoolReservesRequest") - proto.RegisterType((*QueryAllPoolReservesResponse)(nil), "neutron.dex.QueryAllPoolReservesResponse") - proto.RegisterType((*QueryGetPoolReservesRequest)(nil), "neutron.dex.QueryGetPoolReservesRequest") - proto.RegisterType((*QueryGetPoolReservesResponse)(nil), "neutron.dex.QueryGetPoolReservesResponse") - proto.RegisterType((*QueryEstimateMultiHopSwapRequest)(nil), "neutron.dex.QueryEstimateMultiHopSwapRequest") - proto.RegisterType((*QueryEstimateMultiHopSwapResponse)(nil), "neutron.dex.QueryEstimateMultiHopSwapResponse") - proto.RegisterType((*QueryEstimatePlaceLimitOrderRequest)(nil), "neutron.dex.QueryEstimatePlaceLimitOrderRequest") - proto.RegisterType((*QueryEstimatePlaceLimitOrderResponse)(nil), "neutron.dex.QueryEstimatePlaceLimitOrderResponse") - proto.RegisterType((*QueryPoolRequest)(nil), "neutron.dex.QueryPoolRequest") - proto.RegisterType((*QueryPoolByIDRequest)(nil), "neutron.dex.QueryPoolByIDRequest") - proto.RegisterType((*QueryPoolResponse)(nil), "neutron.dex.QueryPoolResponse") - proto.RegisterType((*QueryGetPoolMetadataRequest)(nil), "neutron.dex.QueryGetPoolMetadataRequest") - proto.RegisterType((*QueryGetPoolMetadataResponse)(nil), "neutron.dex.QueryGetPoolMetadataResponse") - proto.RegisterType((*QueryAllPoolMetadataRequest)(nil), "neutron.dex.QueryAllPoolMetadataRequest") - proto.RegisterType((*QueryAllPoolMetadataResponse)(nil), "neutron.dex.QueryAllPoolMetadataResponse") +type QuerySimulateDepositRequest struct { + Msg *MsgDeposit `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } -func init() { proto.RegisterFile("neutron/dex/query.proto", fileDescriptor_b6613ea5fce61e9c) } - -var fileDescriptor_b6613ea5fce61e9c = []byte{ - // 2332 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4d, 0x6c, 0x1c, 0x49, - 0x15, 0x4e, 0x7b, 0x1c, 0xc7, 0x2e, 0x3b, 0xb1, 0x5d, 0xb6, 0x37, 0x93, 0xb1, 0xe3, 0xb1, 0x7b, - 0x37, 0xb1, 0x63, 0xf0, 0x74, 0x6c, 0x36, 0xbb, 0xab, 0x2c, 0x0b, 0x78, 0xf0, 0xae, 0x33, 0xec, - 0x46, 0x31, 0xbd, 0x66, 0x7f, 0xc2, 0x4a, 0xad, 0xf6, 0x74, 0xc5, 0x6e, 0xb9, 0xa7, 0xbb, 0xd3, - 0x5d, 0x63, 0x7b, 0x14, 0xe5, 0xb2, 0xdc, 0x10, 0x87, 0xc0, 0xf2, 0x23, 0x16, 0x69, 0x39, 0x20, - 0x0e, 0x08, 0x21, 0x40, 0x42, 0xdc, 0xb8, 0x20, 0x81, 0x56, 0x08, 0xa1, 0x95, 0xf6, 0x82, 0x40, - 0x1a, 0x50, 0xc2, 0x29, 0x5c, 0x90, 0x0f, 0x9c, 0x51, 0x55, 0xbf, 0x9e, 0xe9, 0x9e, 0xa9, 0x9e, - 0x1e, 0x3b, 0xc3, 0x6a, 0x4f, 0xee, 0xae, 0x7a, 0xaf, 0xdf, 0xf7, 0xbe, 0x7a, 0xf5, 0x5e, 0xd5, - 0x1b, 0xa3, 0xf3, 0x36, 0xa9, 0x52, 0xcf, 0xb1, 0x15, 0x83, 0x1c, 0x2a, 0x77, 0xab, 0xc4, 0xab, - 0x15, 0x5c, 0xcf, 0xa1, 0x0e, 0x1e, 0x86, 0x89, 0x82, 0x41, 0x0e, 0x73, 0x4b, 0x65, 0xc7, 0xaf, - 0x38, 0xbe, 0xb2, 0xad, 0xfb, 0x24, 0x90, 0x52, 0xf6, 0x57, 0xb6, 0x09, 0xd5, 0x57, 0x14, 0x57, - 0xdf, 0x31, 0x6d, 0x9d, 0x9a, 0x8e, 0x1d, 0x28, 0xe6, 0x66, 0xa3, 0xb2, 0xa1, 0x54, 0xd9, 0x31, - 0xc3, 0xf9, 0xc9, 0x1d, 0x67, 0xc7, 0xe1, 0x8f, 0x0a, 0x7b, 0x82, 0xd1, 0x99, 0x1d, 0xc7, 0xd9, - 0xb1, 0x88, 0xa2, 0xbb, 0xa6, 0xa2, 0xdb, 0xb6, 0x43, 0xf9, 0x27, 0x7d, 0x98, 0xcd, 0xc3, 0x2c, - 0x7f, 0xdb, 0xae, 0xde, 0x51, 0xa8, 0x59, 0x21, 0x3e, 0xd5, 0x2b, 0x2e, 0x08, 0xcc, 0x45, 0xdd, - 0x30, 0x88, 0xeb, 0xf8, 0x26, 0xd5, 0x3c, 0x52, 0x76, 0x3c, 0x03, 0x24, 0x2e, 0x45, 0x25, 0x2c, - 0xb3, 0x62, 0x52, 0xcd, 0xf1, 0x0c, 0xe2, 0x69, 0xd4, 0xd3, 0xed, 0xf2, 0x2e, 0x01, 0xb1, 0xa5, - 0x14, 0x31, 0xad, 0xea, 0x13, 0x0f, 0x64, 0xb3, 0x51, 0x59, 0x57, 0xf7, 0xf4, 0x4a, 0x88, 0xf7, - 0xa9, 0xd8, 0x8c, 0xe3, 0x58, 0xa1, 0x1f, 0xad, 0xe3, 0x5a, 0x85, 0x50, 0xdd, 0xd0, 0xa9, 0x9e, - 0x28, 0xe0, 0x11, 0x9f, 0x78, 0xfb, 0xc4, 0x17, 0x39, 0x4a, 0xcd, 0xf2, 0x9e, 0x66, 0x99, 0x77, - 0xab, 0xa6, 0x61, 0xd2, 0x5a, 0xc8, 0x6f, 0x4c, 0xe2, 0x30, 0x18, 0x95, 0x27, 0x11, 0xfe, 0x2a, - 0x5b, 0xb7, 0x4d, 0x0e, 0x53, 0x25, 0x77, 0xab, 0xc4, 0xa7, 0xf2, 0x0d, 0x34, 0x11, 0x1b, 0xf5, - 0x5d, 0xc7, 0xf6, 0x09, 0x5e, 0x41, 0x03, 0x81, 0x3b, 0x59, 0x69, 0x4e, 0x5a, 0x1c, 0x5e, 0x9d, - 0x28, 0x44, 0x82, 0xa1, 0x10, 0x08, 0x17, 0xfb, 0x3f, 0xac, 0xe7, 0x4f, 0xa9, 0x20, 0x28, 0xff, - 0x48, 0x42, 0xcf, 0xf0, 0x4f, 0x6d, 0x10, 0xfa, 0x1a, 0xa3, 0xed, 0x16, 0x63, 0x6d, 0x2b, 0x20, - 0xed, 0x6b, 0x3e, 0xf1, 0xc0, 0x24, 0xce, 0xa2, 0x33, 0xba, 0x61, 0x78, 0xc4, 0x0f, 0x3e, 0x3e, - 0xa4, 0x86, 0xaf, 0x38, 0x8f, 0x86, 0x43, 0x92, 0xf7, 0x48, 0x2d, 0xdb, 0xc7, 0x67, 0x11, 0x0c, - 0xbd, 0x4a, 0x6a, 0xf8, 0x05, 0x94, 0x2d, 0xeb, 0x56, 0x59, 0x3b, 0x30, 0xe9, 0xae, 0xe1, 0xe9, - 0x07, 0xfa, 0xb6, 0x45, 0x34, 0x7f, 0x57, 0xf7, 0x88, 0x9f, 0xcd, 0xcc, 0x49, 0x8b, 0x83, 0xea, - 0x53, 0x6c, 0xfe, 0xcd, 0xc8, 0xf4, 0xeb, 0x7c, 0x56, 0x7e, 0xd0, 0x87, 0x2e, 0xa5, 0xa0, 0x03, - 0xd7, 0x75, 0x94, 0x4d, 0x5a, 0x75, 0x20, 0x43, 0x8e, 0x91, 0x21, 0xfc, 0x1a, 0xe7, 0x46, 0x52, - 0xa7, 0x2c, 0xd1, 0x24, 0xfe, 0x86, 0x84, 0x26, 0x44, 0x2e, 0x70, 0x87, 0x8b, 0x2a, 0x53, 0xfd, - 0x5b, 0x3d, 0x3f, 0x15, 0x6c, 0x23, 0xdf, 0xd8, 0x2b, 0x98, 0x8e, 0x52, 0xd1, 0xe9, 0x6e, 0xa1, - 0x64, 0xd3, 0xc7, 0xf5, 0xbc, 0x48, 0xf7, 0xa8, 0x9e, 0xcf, 0xd5, 0xf4, 0x8a, 0x75, 0x5d, 0x16, - 0x4c, 0xca, 0x2a, 0x3e, 0x68, 0xa7, 0xc4, 0x86, 0xf5, 0x5a, 0xb3, 0xac, 0x8e, 0xeb, 0xf5, 0x0a, - 0x42, 0xcd, 0x2d, 0x0e, 0x14, 0x5c, 0x2e, 0x04, 0xe0, 0x0a, 0x6c, 0x8f, 0x17, 0x82, 0xac, 0x01, - 0x3b, 0xbd, 0xb0, 0xa9, 0xef, 0x10, 0xd0, 0x55, 0x23, 0x9a, 0xf2, 0xc7, 0x12, 0x2c, 0x41, 0xb2, - 0xc1, 0xae, 0x96, 0x20, 0xd3, 0x8b, 0x25, 0xd8, 0x88, 0x39, 0xd5, 0xc7, 0x9d, 0x5a, 0x48, 0x75, - 0x2a, 0xc0, 0x17, 0xf3, 0xea, 0xfb, 0x12, 0x9a, 0x4b, 0x0c, 0xac, 0x90, 0xc2, 0xf3, 0xe8, 0x8c, - 0xab, 0x9b, 0x9e, 0x66, 0x1a, 0x10, 0xf2, 0x03, 0xec, 0xb5, 0x64, 0xe0, 0x8b, 0x08, 0xf1, 0x2d, - 0x6c, 0xda, 0x06, 0x39, 0xe4, 0x30, 0x32, 0xea, 0x10, 0x1b, 0x29, 0xb1, 0x01, 0x7c, 0x01, 0x0d, - 0x52, 0x67, 0x8f, 0xd8, 0x9a, 0x69, 0xf3, 0xf8, 0x1e, 0x52, 0xcf, 0xf0, 0xf7, 0x92, 0xdd, 0xba, - 0x57, 0xfa, 0x5b, 0xf7, 0x8a, 0x5c, 0x43, 0xf3, 0x1d, 0x70, 0x01, 0xd3, 0x5b, 0x68, 0x42, 0xc0, - 0x34, 0x2c, 0xf2, 0x6c, 0x67, 0x92, 0x81, 0xe0, 0xf1, 0x36, 0x82, 0xe5, 0x0f, 0x42, 0x4e, 0x44, - 0x2b, 0x9d, 0xca, 0x49, 0xd4, 0xe9, 0xbe, 0xb8, 0xd3, 0xf1, 0x50, 0xcc, 0x9c, 0x38, 0x14, 0x7f, - 0x2f, 0x01, 0x39, 0x62, 0x80, 0x69, 0xe4, 0x64, 0x9e, 0x80, 0x9c, 0xde, 0x45, 0xde, 0xcf, 0x25, - 0x34, 0x1d, 0x3a, 0xc1, 0x62, 0x7a, 0x3d, 0x28, 0x7a, 0x7e, 0x7a, 0x9e, 0x7d, 0x45, 0x00, 0xe1, - 0x04, 0x34, 0xe2, 0x25, 0x34, 0x6e, 0xda, 0x65, 0xab, 0x6a, 0x10, 0x8d, 0x57, 0x2a, 0x56, 0xc6, - 0x20, 0x0f, 0x8f, 0xc2, 0xc4, 0xa6, 0xe3, 0x58, 0xeb, 0x3a, 0xd5, 0xe5, 0x9f, 0x4a, 0x68, 0x46, - 0x8c, 0x16, 0xd8, 0xfe, 0x3c, 0x1a, 0x84, 0xb2, 0xed, 0x03, 0xc5, 0xb9, 0x18, 0xc5, 0xa0, 0xa0, - 0xf2, 0x92, 0x0e, 0xf4, 0x36, 0x34, 0x7a, 0xc7, 0xea, 0xb7, 0x25, 0xb4, 0xdc, 0x31, 0x4b, 0x15, - 0x6b, 0x6b, 0x01, 0x8d, 0x9f, 0x18, 0xcf, 0xf2, 0x1f, 0x25, 0x54, 0xe8, 0x16, 0x13, 0xb0, 0xf9, - 0x2a, 0x1a, 0x89, 0xc4, 0xae, 0x7f, 0xec, 0xb4, 0x39, 0xdc, 0x0c, 0xdc, 0x1e, 0x92, 0xfb, 0x7e, - 0x24, 0x08, 0xb6, 0xcc, 0xf2, 0xde, 0x6b, 0xe1, 0xc9, 0xe5, 0xd3, 0x90, 0x14, 0x7e, 0x2d, 0xa1, - 0x8b, 0x09, 0xe0, 0x80, 0xd4, 0x0d, 0x74, 0x2e, 0x7e, 0xe0, 0x12, 0x06, 0x6a, 0x4c, 0x17, 0xe8, - 0x3c, 0x4b, 0xa3, 0x83, 0xbd, 0x23, 0xf4, 0x03, 0x09, 0x2d, 0x86, 0x59, 0xbe, 0x64, 0xeb, 0x65, - 0x6a, 0xee, 0x93, 0x9e, 0x66, 0xdc, 0x78, 0x81, 0xca, 0xb4, 0x16, 0xa8, 0xd4, 0x2a, 0xf4, 0x1d, - 0x09, 0x5d, 0xe9, 0x02, 0x20, 0x10, 0x4c, 0xd0, 0x8c, 0x09, 0x42, 0xda, 0x93, 0xd6, 0xa5, 0x0b, - 0x66, 0x92, 0x39, 0xd9, 0x03, 0xd2, 0xd6, 0x2c, 0x2b, 0x95, 0xb4, 0x5e, 0x9d, 0x7e, 0xfe, 0x1e, - 0x12, 0xd1, 0xd9, 0x68, 0xd7, 0x44, 0x64, 0x7a, 0x40, 0x44, 0xef, 0xe2, 0xf0, 0x87, 0x91, 0x5a, - 0xc4, 0x52, 0xbe, 0x0a, 0x77, 0x96, 0x4f, 0xc3, 0xbe, 0xfe, 0x45, 0x24, 0xe9, 0xc4, 0xb1, 0x01, - 0xd9, 0xeb, 0xe8, 0x6c, 0xec, 0xa2, 0x05, 0xec, 0x5e, 0x88, 0xdf, 0x79, 0x22, 0x9a, 0x40, 0xec, - 0x88, 0x1b, 0x19, 0xeb, 0x1d, 0x97, 0xef, 0x86, 0x5c, 0x6e, 0x10, 0xda, 0x2b, 0x2e, 0x53, 0xb6, - 0xf1, 0x18, 0xca, 0xdc, 0x21, 0x84, 0x6f, 0xdf, 0x7e, 0x95, 0x3d, 0xca, 0x06, 0x70, 0xd6, 0x86, - 0x21, 0x99, 0x33, 0xe9, 0xd8, 0x9c, 0xc9, 0x3f, 0xcb, 0xc0, 0x41, 0xf1, 0x65, 0x9f, 0x9a, 0x15, - 0x9d, 0x92, 0x9b, 0x55, 0x8b, 0x9a, 0x37, 0x1c, 0xf7, 0xf5, 0x03, 0xdd, 0x8d, 0xd4, 0xd7, 0xb2, - 0x47, 0x74, 0xea, 0x78, 0x61, 0x7d, 0x85, 0x57, 0x9c, 0x43, 0x83, 0x1e, 0x29, 0x13, 0x73, 0x9f, - 0x78, 0xe0, 0x70, 0xe3, 0x1d, 0xaf, 0xa2, 0x01, 0xcf, 0xa9, 0x52, 0x7e, 0x31, 0x6c, 0xcf, 0xd1, - 0xa1, 0x1d, 0x95, 0x89, 0xa8, 0x20, 0x89, 0xbf, 0x8e, 0x86, 0xf4, 0x8a, 0x53, 0xb5, 0x29, 0x63, - 0x90, 0xe7, 0xb2, 0xe2, 0x17, 0xd8, 0x1d, 0xb7, 0xd3, 0x65, 0xac, 0xa9, 0x71, 0x54, 0xcf, 0x8f, - 0x05, 0x57, 0xb0, 0xc6, 0x90, 0xac, 0x0e, 0x06, 0xcf, 0x25, 0x1b, 0x7f, 0x4f, 0x42, 0x63, 0xe4, - 0xd0, 0xa4, 0xb0, 0x9f, 0x5d, 0xcf, 0x2c, 0x93, 0xec, 0x69, 0x6e, 0x64, 0x0f, 0x8c, 0x3c, 0xbb, - 0x63, 0xd2, 0xdd, 0xea, 0x76, 0xa1, 0xec, 0x54, 0x14, 0x40, 0xbb, 0xec, 0x78, 0x3b, 0xe1, 0xb3, - 0xb2, 0xff, 0xac, 0x52, 0xa5, 0xa6, 0xe5, 0x07, 0xf6, 0x37, 0x3d, 0x52, 0x5e, 0x27, 0xe5, 0xc7, - 0xf5, 0x7c, 0xdb, 0x77, 0x8f, 0xea, 0xf9, 0xf3, 0x01, 0x94, 0xd6, 0x19, 0x59, 0x3d, 0xc7, 0x86, - 0x78, 0x2a, 0xd8, 0x64, 0x03, 0xf8, 0x32, 0x1a, 0x75, 0x59, 0x68, 0x6c, 0x13, 0x9f, 0x6a, 0x9c, - 0x88, 0xec, 0x00, 0x3f, 0xc2, 0x9d, 0x65, 0xc3, 0x45, 0xb6, 0x9b, 0xd8, 0x20, 0xbb, 0xe8, 0xcc, - 0x77, 0x58, 0x2b, 0x88, 0x8b, 0xbb, 0x68, 0xb0, 0xec, 0x98, 0xb6, 0xe6, 0x54, 0x69, 0x23, 0x24, - 0xa2, 0x7b, 0x20, 0x8c, 0xfe, 0x2f, 0x3b, 0xa6, 0x5d, 0x7c, 0x11, 0xfc, 0x5e, 0x88, 0xf8, 0x0d, - 0xbd, 0xa3, 0xe0, 0xcf, 0xb2, 0x6f, 0xec, 0x29, 0xb4, 0xe6, 0x12, 0x9f, 0x2b, 0x3c, 0xae, 0xe7, - 0x1b, 0x5f, 0x57, 0xcf, 0xb0, 0xa7, 0x5b, 0x55, 0x2a, 0xbf, 0xdf, 0x8f, 0x9e, 0x8e, 0x01, 0xdb, - 0xb4, 0xf4, 0x72, 0x24, 0xd9, 0x3d, 0x59, 0x1c, 0x75, 0xb8, 0x82, 0x4d, 0xa3, 0xa1, 0x60, 0x8a, - 0x39, 0x1b, 0x94, 0xbe, 0x40, 0xf6, 0x56, 0x95, 0xe2, 0x02, 0x9a, 0x6c, 0xee, 0x38, 0xcd, 0xb4, - 0x35, 0xea, 0x70, 0xb9, 0xd3, 0x7c, 0xef, 0x8d, 0x35, 0xf6, 0x5e, 0xc9, 0xde, 0x72, 0x98, 0x7c, - 0x2c, 0xf6, 0x06, 0x7a, 0x1c, 0x7b, 0xd7, 0x11, 0x82, 0xfa, 0x51, 0x73, 0x49, 0xf6, 0xcc, 0x9c, - 0xb4, 0x78, 0x6e, 0x75, 0x3a, 0xa9, 0x78, 0xd4, 0x5c, 0xa2, 0x0e, 0x39, 0xe1, 0x23, 0xbe, 0x89, - 0x46, 0xc9, 0xa1, 0x6b, 0x7a, 0x3c, 0x39, 0x69, 0xd4, 0xac, 0x90, 0xec, 0x20, 0x5f, 0xd8, 0x5c, - 0x21, 0xe8, 0xc9, 0x15, 0xc2, 0x9e, 0x5c, 0x61, 0x2b, 0xec, 0xc9, 0x15, 0x07, 0xd9, 0x66, 0x7f, - 0xf0, 0x8f, 0xbc, 0xc4, 0xc2, 0x2d, 0x54, 0x66, 0xd3, 0xb8, 0x82, 0xce, 0x56, 0xf4, 0xc3, 0xb5, - 0x00, 0x25, 0x23, 0x64, 0x88, 0xfb, 0x7a, 0x23, 0xad, 0xe9, 0x71, 0xae, 0xa2, 0x1f, 0x6a, 0x7a, - 0x43, 0xed, 0xa8, 0x9e, 0x9f, 0x0a, 0x1c, 0x8e, 0x8f, 0xcb, 0xea, 0x48, 0xe3, 0xf3, 0x2c, 0x38, - 0xfe, 0x93, 0x81, 0x2e, 0x47, 0x62, 0x70, 0x40, 0xe0, 0xfe, 0x40, 0x42, 0x67, 0xa9, 0x43, 0x75, - 0x8b, 0xad, 0x15, 0x0b, 0xad, 0xf4, 0xf0, 0x7d, 0xeb, 0xf8, 0xe1, 0x1b, 0x37, 0x71, 0x54, 0xcf, - 0x4f, 0x06, 0x4e, 0xc4, 0x86, 0x65, 0x75, 0x98, 0xbf, 0x97, 0x6c, 0xa6, 0x85, 0xdf, 0x93, 0xd0, - 0x88, 0x7f, 0xa0, 0xbb, 0x0d, 0x60, 0x7d, 0x69, 0xc0, 0xde, 0x38, 0x3e, 0xb0, 0x98, 0x85, 0xa3, - 0x7a, 0x7e, 0x22, 0xc0, 0x15, 0x1d, 0x95, 0x55, 0xc4, 0x5e, 0x01, 0x15, 0xe3, 0x8b, 0xcf, 0x3a, - 0x55, 0x1a, 0xc0, 0xca, 0xfc, 0x3f, 0xf8, 0x8a, 0x99, 0x68, 0xf2, 0x15, 0x1b, 0x96, 0xd5, 0x61, - 0xf6, 0x7e, 0xab, 0x4a, 0x99, 0x96, 0xfc, 0x0e, 0x1a, 0x0b, 0x5a, 0x9a, 0xbc, 0xd2, 0x3c, 0x59, - 0x03, 0x06, 0x0a, 0x63, 0xa6, 0x59, 0x18, 0x15, 0x34, 0xd9, 0xf8, 0x7a, 0xb1, 0x56, 0x5a, 0x8f, - 0x5a, 0x60, 0x05, 0x11, 0x2c, 0xf4, 0xab, 0x03, 0xec, 0xb5, 0x64, 0xc8, 0x5f, 0x42, 0xe3, 0x11, - 0x38, 0x10, 0x6d, 0x9f, 0x41, 0xfd, 0x6c, 0x1a, 0x62, 0x6c, 0xbc, 0xad, 0x6a, 0x42, 0xb5, 0xe4, - 0x42, 0xf2, 0x72, 0xfc, 0x3c, 0x70, 0x13, 0x1a, 0xc6, 0xa1, 0xe5, 0x73, 0xa8, 0xaf, 0x61, 0xb4, - 0xcf, 0x34, 0x5a, 0x4b, 0x77, 0x53, 0xbc, 0x59, 0xba, 0x37, 0xa3, 0x8d, 0xe7, 0xc4, 0xd2, 0x1d, - 0x6a, 0x42, 0xa3, 0x77, 0x24, 0x3a, 0x26, 0x93, 0xf8, 0x81, 0xaf, 0x15, 0x54, 0xaf, 0x8e, 0xcd, - 0xad, 0x87, 0x37, 0x91, 0x37, 0x6e, 0x8b, 0x37, 0x99, 0xae, 0xbc, 0x71, 0x23, 0x63, 0x3d, 0x3b, - 0xbc, 0xad, 0xfe, 0x37, 0x8b, 0x4e, 0x73, 0xbc, 0x78, 0x17, 0x0d, 0x04, 0x7d, 0x72, 0x9c, 0x8f, - 0x61, 0x69, 0x6f, 0xc2, 0xe7, 0xe6, 0x92, 0x05, 0x02, 0x13, 0xf2, 0xf4, 0xbb, 0x1f, 0xff, 0xeb, - 0xbd, 0xbe, 0x29, 0x3c, 0xa1, 0xb4, 0xff, 0xe2, 0x80, 0xff, 0x20, 0xa1, 0x29, 0xe1, 0x5d, 0x1e, - 0xaf, 0xb4, 0x7f, 0x38, 0xa5, 0x3b, 0x9f, 0x5b, 0x3d, 0x8e, 0x0a, 0xa0, 0x7b, 0x99, 0xa3, 0xfb, - 0x22, 0x7e, 0x49, 0xe9, 0xe6, 0xb7, 0x13, 0xe5, 0x1e, 0xf4, 0x47, 0xee, 0x2b, 0xf7, 0x22, 0x97, - 0xc7, 0xfb, 0xf8, 0x57, 0x12, 0xca, 0x0a, 0x0d, 0xad, 0x59, 0x96, 0xc8, 0x95, 0x94, 0xc6, 0xb5, - 0xc8, 0x95, 0xb4, 0xd6, 0xb3, 0xbc, 0xcc, 0x5d, 0x59, 0xc0, 0x97, 0xba, 0x72, 0x05, 0xff, 0x45, - 0x42, 0xf3, 0x49, 0x90, 0x1b, 0x4d, 0x19, 0x7c, 0xbd, 0x7b, 0x20, 0xad, 0xdd, 0xa5, 0xdc, 0x8b, - 0x27, 0xd2, 0x05, 0x6f, 0xae, 0x72, 0x6f, 0x96, 0xf0, 0x62, 0xcc, 0x1b, 0xbe, 0x08, 0xd1, 0xee, - 0x50, 0x73, 0x45, 0xf0, 0x9f, 0x25, 0x34, 0xde, 0x7e, 0x4f, 0x5c, 0xee, 0x2e, 0x28, 0x42, 0xcc, - 0x85, 0x6e, 0xc5, 0x01, 0xe6, 0x5b, 0x1c, 0xa6, 0x8a, 0x37, 0xd3, 0x48, 0x57, 0xee, 0x41, 0x16, - 0x67, 0xa1, 0x03, 0xa7, 0x32, 0xf6, 0xd8, 0xc8, 0xe0, 0xad, 0x21, 0xf5, 0x1b, 0x09, 0x4d, 0xb6, - 0xd9, 0x65, 0xe1, 0xb4, 0xdc, 0x1d, 0xad, 0x1d, 0x3c, 0xea, 0xd4, 0x3a, 0x96, 0x5f, 0xe2, 0x1e, - 0x3d, 0x8f, 0xaf, 0x9d, 0xc8, 0x23, 0xfc, 0x5d, 0x09, 0x8d, 0x46, 0x9b, 0xa4, 0x0c, 0xf1, 0xa2, - 0x10, 0x82, 0xa0, 0xf1, 0x9b, 0xbb, 0xd2, 0x85, 0x24, 0xe0, 0xfc, 0x2c, 0xc7, 0x79, 0x19, 0x3f, - 0xd3, 0x1e, 0x20, 0x61, 0x6b, 0x35, 0x12, 0x1c, 0x3f, 0x91, 0xd0, 0x58, 0xac, 0xbb, 0xc5, 0x70, - 0x89, 0xad, 0x89, 0xba, 0x7b, 0xb9, 0xa5, 0x6e, 0x44, 0x01, 0xd9, 0x0b, 0x1c, 0xd9, 0x2a, 0xbe, - 0xaa, 0x24, 0xff, 0xde, 0x29, 0x26, 0xef, 0x4f, 0x7d, 0xe8, 0x42, 0x62, 0x87, 0x05, 0x5f, 0x13, - 0xc6, 0x66, 0x5a, 0x1b, 0x28, 0xf7, 0xdc, 0x71, 0xd5, 0xc0, 0x8d, 0xdf, 0x49, 0xdc, 0x8f, 0xdf, - 0x4a, 0xb7, 0xdf, 0xc6, 0x6f, 0xc6, 0x5c, 0xb9, 0x63, 0x5a, 0x16, 0x31, 0xb4, 0x5e, 0x44, 0xf9, - 0xdb, 0xb1, 0x0f, 0x77, 0x6a, 0x1c, 0x1d, 0xfb, 0xd3, 0xff, 0x96, 0xd0, 0x4c, 0xa2, 0x97, 0x6c, - 0xf9, 0xaf, 0x09, 0xd7, 0xf4, 0x24, 0x7c, 0x76, 0xd3, 0x18, 0x93, 0xdf, 0xe1, 0x74, 0xbe, 0x71, - 0xfb, 0x0a, 0x5e, 0xe8, 0x92, 0x4d, 0x7c, 0xa5, 0x6b, 0x76, 0xf0, 0x8f, 0x25, 0x34, 0x1a, 0x6d, - 0x5a, 0x24, 0xef, 0x3b, 0x41, 0x63, 0x26, 0x61, 0xdf, 0x89, 0xda, 0x27, 0xf2, 0xf3, 0xdc, 0x8d, - 0x15, 0xac, 0x28, 0x89, 0x3f, 0xf7, 0x8b, 0x83, 0xfb, 0x97, 0x12, 0x1a, 0x89, 0x7e, 0x51, 0x04, - 0x4f, 0xdc, 0x37, 0x12, 0xc1, 0x4b, 0xe8, 0xee, 0xc8, 0x5f, 0xe1, 0xf0, 0xd6, 0x71, 0xf1, 0x98, - 0xf0, 0x5a, 0x22, 0xe9, 0x0e, 0x21, 0x3c, 0x69, 0x4c, 0x8a, 0x5a, 0x06, 0xa2, 0x14, 0xdc, 0xa1, - 0x0d, 0x24, 0x4a, 0xc1, 0x9d, 0x3a, 0x11, 0x09, 0xa9, 0x8d, 0x80, 0x8a, 0x56, 0x61, 0x3a, 0xda, - 0xae, 0xe3, 0x6a, 0xec, 0xee, 0xc0, 0x78, 0x3d, 0x9f, 0x70, 0x45, 0xc4, 0x57, 0x93, 0x2d, 0x8b, - 0x5b, 0x0d, 0xb9, 0x95, 0x63, 0x68, 0x00, 0x5c, 0x85, 0xc3, 0x6d, 0x0d, 0xeb, 0x06, 0x5c, 0x97, - 0xa9, 0x45, 0x63, 0x16, 0xdf, 0x47, 0xfd, 0x6c, 0xed, 0xf0, 0x45, 0xc1, 0xe1, 0xb1, 0x79, 0xf3, - 0xc9, 0xcd, 0x26, 0x4d, 0x83, 0xdd, 0xe7, 0xb8, 0xdd, 0xab, 0xb8, 0xd0, 0xb6, 0xd4, 0xb1, 0x15, - 0x6e, 0x5b, 0x56, 0x0f, 0x0d, 0x86, 0x57, 0x20, 0x3c, 0x2f, 0xb6, 0x11, 0xb9, 0x1e, 0xa5, 0xc2, - 0x78, 0x9a, 0xc3, 0xb8, 0x88, 0xa7, 0x45, 0x30, 0x82, 0x7b, 0xd5, 0x7d, 0xfc, 0x2d, 0x08, 0xfe, - 0xc6, 0xb1, 0x3d, 0x39, 0xf8, 0x5b, 0xee, 0x23, 0x1d, 0x82, 0xbf, 0xf5, 0x46, 0x21, 0x2f, 0x70, - 0x28, 0xf3, 0x38, 0xaf, 0x24, 0xfe, 0xaf, 0x8e, 0x72, 0x8f, 0xc1, 0xf9, 0x26, 0x64, 0x8b, 0xf0, - 0x0b, 0x9d, 0xb3, 0x45, 0x17, 0x88, 0x12, 0xee, 0x38, 0xb2, 0xcc, 0x11, 0xcd, 0xe0, 0x5c, 0x32, - 0xa2, 0xe2, 0xc6, 0x87, 0x0f, 0x67, 0xa5, 0x8f, 0x1e, 0xce, 0x4a, 0xff, 0x7c, 0x38, 0x2b, 0x3d, - 0x78, 0x34, 0x7b, 0xea, 0xa3, 0x47, 0xb3, 0xa7, 0xfe, 0xfa, 0x68, 0xf6, 0xd4, 0xed, 0xe5, 0xf4, - 0xae, 0xe2, 0x61, 0x50, 0x5c, 0xd9, 0xcd, 0x7b, 0x7b, 0x80, 0xb7, 0x73, 0x3e, 0xf7, 0xbf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x80, 0xda, 0x02, 0xc7, 0x18, 0x26, 0x00, 0x00, +func (m *QuerySimulateDepositRequest) Reset() { *m = QuerySimulateDepositRequest{} } +func (m *QuerySimulateDepositRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateDepositRequest) ProtoMessage() {} +func (*QuerySimulateDepositRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{35} +} +func (m *QuerySimulateDepositRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateDepositRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateDepositRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QuerySimulateDepositRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateDepositRequest.Merge(m, src) +} +func (m *QuerySimulateDepositRequest) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateDepositRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateDepositRequest.DiscardUnknown(m) } -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +var xxx_messageInfo_QuerySimulateDepositRequest proto.InternalMessageInfo -// QueryClient is the client API for Query service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type QueryClient interface { - // Parameters queries the parameters of the module. - Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) - // Queries a LimitOrderTrancheUser by index. - LimitOrderTrancheUser(ctx context.Context, in *QueryGetLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheUserResponse, error) - // Queries a list of LimitOrderTranchUser items. - LimitOrderTrancheUserAll(ctx context.Context, in *QueryAllLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserResponse, error) - // Queries a list of LimitOrderTrancheUser items for a given address. - LimitOrderTrancheUserAllByAddress(ctx context.Context, in *QueryAllLimitOrderTrancheUserByAddressRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) - // Queries a LimitOrderTranche by index. - LimitOrderTranche(ctx context.Context, in *QueryGetLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheResponse, error) - // Queries a list of LimitOrderTranche items for a given pairID / TokenIn - // combination. - LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheResponse, error) - // Queries a list of UserDeposits items. - UserDepositsAll(ctx context.Context, in *QueryAllUserDepositsRequest, opts ...grpc.CallOption) (*QueryAllUserDepositsResponse, error) - // Queries a list of TickLiquidity items. - TickLiquidityAll(ctx context.Context, in *QueryAllTickLiquidityRequest, opts ...grpc.CallOption) (*QueryAllTickLiquidityResponse, error) - // Queries a InactiveLimitOrderTranche by index. - InactiveLimitOrderTranche(ctx context.Context, in *QueryGetInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetInactiveLimitOrderTrancheResponse, error) - // Queries a list of InactiveLimitOrderTranche items. - InactiveLimitOrderTrancheAll(ctx context.Context, in *QueryAllInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllInactiveLimitOrderTrancheResponse, error) - // Queries a list of PoolReserves items. - PoolReservesAll(ctx context.Context, in *QueryAllPoolReservesRequest, opts ...grpc.CallOption) (*QueryAllPoolReservesResponse, error) - // Queries a PoolReserve by index - PoolReserves(ctx context.Context, in *QueryGetPoolReservesRequest, opts ...grpc.CallOption) (*QueryGetPoolReservesResponse, error) - // Queries the simulated result of a multihop swap - EstimateMultiHopSwap(ctx context.Context, in *QueryEstimateMultiHopSwapRequest, opts ...grpc.CallOption) (*QueryEstimateMultiHopSwapResponse, error) - // Queries the simulated result of a PlaceLimit order - EstimatePlaceLimitOrder(ctx context.Context, in *QueryEstimatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QueryEstimatePlaceLimitOrderResponse, error) - // Queries a pool by pair, tick and fee - Pool(ctx context.Context, in *QueryPoolRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) - // Queries a pool by ID - PoolByID(ctx context.Context, in *QueryPoolByIDRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) - // Queries a PoolMetadata by ID - PoolMetadata(ctx context.Context, in *QueryGetPoolMetadataRequest, opts ...grpc.CallOption) (*QueryGetPoolMetadataResponse, error) - // Queries a list of PoolMetadata items. - PoolMetadataAll(ctx context.Context, in *QueryAllPoolMetadataRequest, opts ...grpc.CallOption) (*QueryAllPoolMetadataResponse, error) +func (m *QuerySimulateDepositRequest) GetMsg() *MsgDeposit { + if m != nil { + return m.Msg + } + return nil } -type queryClient struct { - cc grpc1.ClientConn +type QuerySimulateDepositResponse struct { + Resp *MsgDepositResponse `protobuf:"bytes,1,opt,name=resp,proto3" json:"resp,omitempty"` } -func NewQueryClient(cc grpc1.ClientConn) QueryClient { - return &queryClient{cc} +func (m *QuerySimulateDepositResponse) Reset() { *m = QuerySimulateDepositResponse{} } +func (m *QuerySimulateDepositResponse) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateDepositResponse) ProtoMessage() {} +func (*QuerySimulateDepositResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{36} } - -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { - out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/Params", in, out, opts...) - if err != nil { - return nil, err +func (m *QuerySimulateDepositResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateDepositResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateDepositResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return out, nil +} +func (m *QuerySimulateDepositResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateDepositResponse.Merge(m, src) +} +func (m *QuerySimulateDepositResponse) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateDepositResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateDepositResponse.DiscardUnknown(m) } -func (c *queryClient) LimitOrderTrancheUser(ctx context.Context, in *QueryGetLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheUserResponse, error) { - out := new(QueryGetLimitOrderTrancheUserResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUser", in, out, opts...) - if err != nil { - return nil, err +var xxx_messageInfo_QuerySimulateDepositResponse proto.InternalMessageInfo + +func (m *QuerySimulateDepositResponse) GetResp() *MsgDepositResponse { + if m != nil { + return m.Resp } - return out, nil + return nil } -func (c *queryClient) LimitOrderTrancheUserAll(ctx context.Context, in *QueryAllLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserResponse, error) { - out := new(QueryAllLimitOrderTrancheUserResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUserAll", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +type QuerySimulateWithdrawalRequest struct { + Msg *MsgWithdrawal `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } -func (c *queryClient) LimitOrderTrancheUserAllByAddress(ctx context.Context, in *QueryAllLimitOrderTrancheUserByAddressRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) { - out := new(QueryAllLimitOrderTrancheUserByAddressResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress", in, out, opts...) - if err != nil { - return nil, err +func (m *QuerySimulateWithdrawalRequest) Reset() { *m = QuerySimulateWithdrawalRequest{} } +func (m *QuerySimulateWithdrawalRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateWithdrawalRequest) ProtoMessage() {} +func (*QuerySimulateWithdrawalRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{37} +} +func (m *QuerySimulateWithdrawalRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateWithdrawalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateWithdrawalRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return out, nil +} +func (m *QuerySimulateWithdrawalRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateWithdrawalRequest.Merge(m, src) +} +func (m *QuerySimulateWithdrawalRequest) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateWithdrawalRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateWithdrawalRequest.DiscardUnknown(m) } -func (c *queryClient) LimitOrderTranche(ctx context.Context, in *QueryGetLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheResponse, error) { - out := new(QueryGetLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTranche", in, out, opts...) - if err != nil { - return nil, err +var xxx_messageInfo_QuerySimulateWithdrawalRequest proto.InternalMessageInfo + +func (m *QuerySimulateWithdrawalRequest) GetMsg() *MsgWithdrawal { + if m != nil { + return m.Msg } - return out, nil + return nil } -func (c *queryClient) LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheResponse, error) { - out := new(QueryAllLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheAll", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +type QuerySimulateWithdrawalResponse struct { + Resp *MsgWithdrawalResponse `protobuf:"bytes,1,opt,name=resp,proto3" json:"resp,omitempty"` } -func (c *queryClient) UserDepositsAll(ctx context.Context, in *QueryAllUserDepositsRequest, opts ...grpc.CallOption) (*QueryAllUserDepositsResponse, error) { - out := new(QueryAllUserDepositsResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/UserDepositsAll", in, out, opts...) - if err != nil { - return nil, err +func (m *QuerySimulateWithdrawalResponse) Reset() { *m = QuerySimulateWithdrawalResponse{} } +func (m *QuerySimulateWithdrawalResponse) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateWithdrawalResponse) ProtoMessage() {} +func (*QuerySimulateWithdrawalResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{38} +} +func (m *QuerySimulateWithdrawalResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateWithdrawalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateWithdrawalResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return out, nil +} +func (m *QuerySimulateWithdrawalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateWithdrawalResponse.Merge(m, src) +} +func (m *QuerySimulateWithdrawalResponse) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateWithdrawalResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateWithdrawalResponse.DiscardUnknown(m) } -func (c *queryClient) TickLiquidityAll(ctx context.Context, in *QueryAllTickLiquidityRequest, opts ...grpc.CallOption) (*QueryAllTickLiquidityResponse, error) { - out := new(QueryAllTickLiquidityResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/TickLiquidityAll", in, out, opts...) - if err != nil { - return nil, err +var xxx_messageInfo_QuerySimulateWithdrawalResponse proto.InternalMessageInfo + +func (m *QuerySimulateWithdrawalResponse) GetResp() *MsgWithdrawalResponse { + if m != nil { + return m.Resp } - return out, nil + return nil } -func (c *queryClient) InactiveLimitOrderTranche(ctx context.Context, in *QueryGetInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetInactiveLimitOrderTrancheResponse, error) { - out := new(QueryGetInactiveLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/InactiveLimitOrderTranche", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +type QuerySimulatePlaceLimitOrderRequest struct { + Msg *MsgPlaceLimitOrder `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } -func (c *queryClient) InactiveLimitOrderTrancheAll(ctx context.Context, in *QueryAllInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllInactiveLimitOrderTrancheResponse, error) { - out := new(QueryAllInactiveLimitOrderTrancheResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/InactiveLimitOrderTrancheAll", in, out, opts...) - if err != nil { - return nil, err +func (m *QuerySimulatePlaceLimitOrderRequest) Reset() { *m = QuerySimulatePlaceLimitOrderRequest{} } +func (m *QuerySimulatePlaceLimitOrderRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySimulatePlaceLimitOrderRequest) ProtoMessage() {} +func (*QuerySimulatePlaceLimitOrderRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{39} +} +func (m *QuerySimulatePlaceLimitOrderRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulatePlaceLimitOrderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulatePlaceLimitOrderRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return out, nil +} +func (m *QuerySimulatePlaceLimitOrderRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulatePlaceLimitOrderRequest.Merge(m, src) +} +func (m *QuerySimulatePlaceLimitOrderRequest) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulatePlaceLimitOrderRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulatePlaceLimitOrderRequest.DiscardUnknown(m) } -func (c *queryClient) PoolReservesAll(ctx context.Context, in *QueryAllPoolReservesRequest, opts ...grpc.CallOption) (*QueryAllPoolReservesResponse, error) { - out := new(QueryAllPoolReservesResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolReservesAll", in, out, opts...) - if err != nil { - return nil, err +var xxx_messageInfo_QuerySimulatePlaceLimitOrderRequest proto.InternalMessageInfo + +func (m *QuerySimulatePlaceLimitOrderRequest) GetMsg() *MsgPlaceLimitOrder { + if m != nil { + return m.Msg } - return out, nil + return nil } -func (c *queryClient) PoolReserves(ctx context.Context, in *QueryGetPoolReservesRequest, opts ...grpc.CallOption) (*QueryGetPoolReservesResponse, error) { - out := new(QueryGetPoolReservesResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolReserves", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +type QuerySimulatePlaceLimitOrderResponse struct { + Resp *MsgPlaceLimitOrderResponse `protobuf:"bytes,1,opt,name=resp,proto3" json:"resp,omitempty"` } -func (c *queryClient) EstimateMultiHopSwap(ctx context.Context, in *QueryEstimateMultiHopSwapRequest, opts ...grpc.CallOption) (*QueryEstimateMultiHopSwapResponse, error) { - out := new(QueryEstimateMultiHopSwapResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/EstimateMultiHopSwap", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +func (m *QuerySimulatePlaceLimitOrderResponse) Reset() { *m = QuerySimulatePlaceLimitOrderResponse{} } +func (m *QuerySimulatePlaceLimitOrderResponse) String() string { return proto.CompactTextString(m) } +func (*QuerySimulatePlaceLimitOrderResponse) ProtoMessage() {} +func (*QuerySimulatePlaceLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{40} } - -func (c *queryClient) EstimatePlaceLimitOrder(ctx context.Context, in *QueryEstimatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QueryEstimatePlaceLimitOrderResponse, error) { - out := new(QueryEstimatePlaceLimitOrderResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/EstimatePlaceLimitOrder", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +func (m *QuerySimulatePlaceLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } - -func (c *queryClient) Pool(ctx context.Context, in *QueryPoolRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) { - out := new(QueryPoolResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/Pool", in, out, opts...) - if err != nil { - return nil, err +func (m *QuerySimulatePlaceLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulatePlaceLimitOrderResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return out, nil +} +func (m *QuerySimulatePlaceLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulatePlaceLimitOrderResponse.Merge(m, src) +} +func (m *QuerySimulatePlaceLimitOrderResponse) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulatePlaceLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulatePlaceLimitOrderResponse.DiscardUnknown(m) } -func (c *queryClient) PoolByID(ctx context.Context, in *QueryPoolByIDRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) { - out := new(QueryPoolResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolByID", in, out, opts...) - if err != nil { - return nil, err +var xxx_messageInfo_QuerySimulatePlaceLimitOrderResponse proto.InternalMessageInfo + +func (m *QuerySimulatePlaceLimitOrderResponse) GetResp() *MsgPlaceLimitOrderResponse { + if m != nil { + return m.Resp } - return out, nil + return nil } -func (c *queryClient) PoolMetadata(ctx context.Context, in *QueryGetPoolMetadataRequest, opts ...grpc.CallOption) (*QueryGetPoolMetadataResponse, error) { - out := new(QueryGetPoolMetadataResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolMetadata", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil +type QuerySimulateWithdrawFilledLimitOrderRequest struct { + Msg *MsgWithdrawFilledLimitOrder `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } -func (c *queryClient) PoolMetadataAll(ctx context.Context, in *QueryAllPoolMetadataRequest, opts ...grpc.CallOption) (*QueryAllPoolMetadataResponse, error) { - out := new(QueryAllPoolMetadataResponse) - err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolMetadataAll", in, out, opts...) - if err != nil { - return nil, err +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) Reset() { + *m = QuerySimulateWithdrawFilledLimitOrderRequest{} +} +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) String() string { + return proto.CompactTextString(m) +} +func (*QuerySimulateWithdrawFilledLimitOrderRequest) ProtoMessage() {} +func (*QuerySimulateWithdrawFilledLimitOrderRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{41} +} +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return out, nil } - -// QueryServer is the server API for Query service. -type QueryServer interface { - // Parameters queries the parameters of the module. - Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) - // Queries a LimitOrderTrancheUser by index. - LimitOrderTrancheUser(context.Context, *QueryGetLimitOrderTrancheUserRequest) (*QueryGetLimitOrderTrancheUserResponse, error) - // Queries a list of LimitOrderTranchUser items. - LimitOrderTrancheUserAll(context.Context, *QueryAllLimitOrderTrancheUserRequest) (*QueryAllLimitOrderTrancheUserResponse, error) - // Queries a list of LimitOrderTrancheUser items for a given address. - LimitOrderTrancheUserAllByAddress(context.Context, *QueryAllLimitOrderTrancheUserByAddressRequest) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) - // Queries a LimitOrderTranche by index. - LimitOrderTranche(context.Context, *QueryGetLimitOrderTrancheRequest) (*QueryGetLimitOrderTrancheResponse, error) - // Queries a list of LimitOrderTranche items for a given pairID / TokenIn - // combination. - LimitOrderTrancheAll(context.Context, *QueryAllLimitOrderTrancheRequest) (*QueryAllLimitOrderTrancheResponse, error) - // Queries a list of UserDeposits items. - UserDepositsAll(context.Context, *QueryAllUserDepositsRequest) (*QueryAllUserDepositsResponse, error) - // Queries a list of TickLiquidity items. - TickLiquidityAll(context.Context, *QueryAllTickLiquidityRequest) (*QueryAllTickLiquidityResponse, error) - // Queries a InactiveLimitOrderTranche by index. - InactiveLimitOrderTranche(context.Context, *QueryGetInactiveLimitOrderTrancheRequest) (*QueryGetInactiveLimitOrderTrancheResponse, error) - // Queries a list of InactiveLimitOrderTranche items. - InactiveLimitOrderTrancheAll(context.Context, *QueryAllInactiveLimitOrderTrancheRequest) (*QueryAllInactiveLimitOrderTrancheResponse, error) - // Queries a list of PoolReserves items. - PoolReservesAll(context.Context, *QueryAllPoolReservesRequest) (*QueryAllPoolReservesResponse, error) - // Queries a PoolReserve by index - PoolReserves(context.Context, *QueryGetPoolReservesRequest) (*QueryGetPoolReservesResponse, error) - // Queries the simulated result of a multihop swap - EstimateMultiHopSwap(context.Context, *QueryEstimateMultiHopSwapRequest) (*QueryEstimateMultiHopSwapResponse, error) - // Queries the simulated result of a PlaceLimit order - EstimatePlaceLimitOrder(context.Context, *QueryEstimatePlaceLimitOrderRequest) (*QueryEstimatePlaceLimitOrderResponse, error) - // Queries a pool by pair, tick and fee - Pool(context.Context, *QueryPoolRequest) (*QueryPoolResponse, error) - // Queries a pool by ID - PoolByID(context.Context, *QueryPoolByIDRequest) (*QueryPoolResponse, error) - // Queries a PoolMetadata by ID - PoolMetadata(context.Context, *QueryGetPoolMetadataRequest) (*QueryGetPoolMetadataResponse, error) - // Queries a list of PoolMetadata items. - PoolMetadataAll(context.Context, *QueryAllPoolMetadataRequest) (*QueryAllPoolMetadataResponse, error) +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderRequest.Merge(m, src) +} +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderRequest.DiscardUnknown(m) } -// UnimplementedQueryServer can be embedded to have forward compatible implementations. -type UnimplementedQueryServer struct { +var xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderRequest proto.InternalMessageInfo + +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) GetMsg() *MsgWithdrawFilledLimitOrder { + if m != nil { + return m.Msg + } + return nil } -func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") +type QuerySimulateWithdrawFilledLimitOrderResponse struct { + Resp *MsgWithdrawFilledLimitOrderResponse `protobuf:"bytes,1,opt,name=resp,proto3" json:"resp,omitempty"` } -func (*UnimplementedQueryServer) LimitOrderTrancheUser(ctx context.Context, req *QueryGetLimitOrderTrancheUserRequest) (*QueryGetLimitOrderTrancheUserResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheUser not implemented") + +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) Reset() { + *m = QuerySimulateWithdrawFilledLimitOrderResponse{} } -func (*UnimplementedQueryServer) LimitOrderTrancheUserAll(ctx context.Context, req *QueryAllLimitOrderTrancheUserRequest) (*QueryAllLimitOrderTrancheUserResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheUserAll not implemented") +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) String() string { + return proto.CompactTextString(m) } -func (*UnimplementedQueryServer) LimitOrderTrancheUserAllByAddress(ctx context.Context, req *QueryAllLimitOrderTrancheUserByAddressRequest) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheUserAllByAddress not implemented") +func (*QuerySimulateWithdrawFilledLimitOrderResponse) ProtoMessage() {} +func (*QuerySimulateWithdrawFilledLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{42} } -func (*UnimplementedQueryServer) LimitOrderTranche(ctx context.Context, req *QueryGetLimitOrderTrancheRequest) (*QueryGetLimitOrderTrancheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTranche not implemented") +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } -func (*UnimplementedQueryServer) LimitOrderTrancheAll(ctx context.Context, req *QueryAllLimitOrderTrancheRequest) (*QueryAllLimitOrderTrancheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheAll not implemented") +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } } -func (*UnimplementedQueryServer) UserDepositsAll(ctx context.Context, req *QueryAllUserDepositsRequest) (*QueryAllUserDepositsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UserDepositsAll not implemented") +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderResponse.Merge(m, src) } -func (*UnimplementedQueryServer) TickLiquidityAll(ctx context.Context, req *QueryAllTickLiquidityRequest) (*QueryAllTickLiquidityResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method TickLiquidityAll not implemented") +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) XXX_Size() int { + return m.Size() } -func (*UnimplementedQueryServer) InactiveLimitOrderTranche(ctx context.Context, req *QueryGetInactiveLimitOrderTrancheRequest) (*QueryGetInactiveLimitOrderTrancheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method InactiveLimitOrderTranche not implemented") +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderResponse.DiscardUnknown(m) } -func (*UnimplementedQueryServer) InactiveLimitOrderTrancheAll(ctx context.Context, req *QueryAllInactiveLimitOrderTrancheRequest) (*QueryAllInactiveLimitOrderTrancheResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method InactiveLimitOrderTrancheAll not implemented") + +var xxx_messageInfo_QuerySimulateWithdrawFilledLimitOrderResponse proto.InternalMessageInfo + +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) GetResp() *MsgWithdrawFilledLimitOrderResponse { + if m != nil { + return m.Resp + } + return nil } -func (*UnimplementedQueryServer) PoolReservesAll(ctx context.Context, req *QueryAllPoolReservesRequest) (*QueryAllPoolReservesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PoolReservesAll not implemented") + +type QuerySimulateCancelLimitOrderRequest struct { + Msg *MsgCancelLimitOrder `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } -func (*UnimplementedQueryServer) PoolReserves(ctx context.Context, req *QueryGetPoolReservesRequest) (*QueryGetPoolReservesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PoolReserves not implemented") + +func (m *QuerySimulateCancelLimitOrderRequest) Reset() { *m = QuerySimulateCancelLimitOrderRequest{} } +func (m *QuerySimulateCancelLimitOrderRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateCancelLimitOrderRequest) ProtoMessage() {} +func (*QuerySimulateCancelLimitOrderRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{43} } -func (*UnimplementedQueryServer) EstimateMultiHopSwap(ctx context.Context, req *QueryEstimateMultiHopSwapRequest) (*QueryEstimateMultiHopSwapResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method EstimateMultiHopSwap not implemented") +func (m *QuerySimulateCancelLimitOrderRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) } -func (*UnimplementedQueryServer) EstimatePlaceLimitOrder(ctx context.Context, req *QueryEstimatePlaceLimitOrderRequest) (*QueryEstimatePlaceLimitOrderResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method EstimatePlaceLimitOrder not implemented") +func (m *QuerySimulateCancelLimitOrderRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateCancelLimitOrderRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } } -func (*UnimplementedQueryServer) Pool(ctx context.Context, req *QueryPoolRequest) (*QueryPoolResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Pool not implemented") +func (m *QuerySimulateCancelLimitOrderRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateCancelLimitOrderRequest.Merge(m, src) } -func (*UnimplementedQueryServer) PoolByID(ctx context.Context, req *QueryPoolByIDRequest) (*QueryPoolResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PoolByID not implemented") +func (m *QuerySimulateCancelLimitOrderRequest) XXX_Size() int { + return m.Size() } -func (*UnimplementedQueryServer) PoolMetadata(ctx context.Context, req *QueryGetPoolMetadataRequest) (*QueryGetPoolMetadataResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PoolMetadata not implemented") +func (m *QuerySimulateCancelLimitOrderRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateCancelLimitOrderRequest.DiscardUnknown(m) } -func (*UnimplementedQueryServer) PoolMetadataAll(ctx context.Context, req *QueryAllPoolMetadataRequest) (*QueryAllPoolMetadataResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method PoolMetadataAll not implemented") + +var xxx_messageInfo_QuerySimulateCancelLimitOrderRequest proto.InternalMessageInfo + +func (m *QuerySimulateCancelLimitOrderRequest) GetMsg() *MsgCancelLimitOrder { + if m != nil { + return m.Msg + } + return nil } -func RegisterQueryServer(s grpc1.Server, srv QueryServer) { - s.RegisterService(&_Query_serviceDesc, srv) +type QuerySimulateCancelLimitOrderResponse struct { + Resp *MsgCancelLimitOrderResponse `protobuf:"bytes,1,opt,name=resp,proto3" json:"resp,omitempty"` } -func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).Params(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/Params", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) +func (m *QuerySimulateCancelLimitOrderResponse) Reset() { *m = QuerySimulateCancelLimitOrderResponse{} } +func (m *QuerySimulateCancelLimitOrderResponse) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateCancelLimitOrderResponse) ProtoMessage() {} +func (*QuerySimulateCancelLimitOrderResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{44} +} +func (m *QuerySimulateCancelLimitOrderResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateCancelLimitOrderResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateCancelLimitOrderResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return interceptor(ctx, in, info, handler) +} +func (m *QuerySimulateCancelLimitOrderResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateCancelLimitOrderResponse.Merge(m, src) +} +func (m *QuerySimulateCancelLimitOrderResponse) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateCancelLimitOrderResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateCancelLimitOrderResponse.DiscardUnknown(m) } -func _Query_LimitOrderTrancheUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetLimitOrderTrancheUserRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).LimitOrderTrancheUser(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/LimitOrderTrancheUser", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LimitOrderTrancheUser(ctx, req.(*QueryGetLimitOrderTrancheUserRequest)) +var xxx_messageInfo_QuerySimulateCancelLimitOrderResponse proto.InternalMessageInfo + +func (m *QuerySimulateCancelLimitOrderResponse) GetResp() *MsgCancelLimitOrderResponse { + if m != nil { + return m.Resp } - return interceptor(ctx, in, info, handler) + return nil } -func _Query_LimitOrderTrancheUserAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllLimitOrderTrancheUserRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).LimitOrderTrancheUserAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/LimitOrderTrancheUserAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LimitOrderTrancheUserAll(ctx, req.(*QueryAllLimitOrderTrancheUserRequest)) - } - return interceptor(ctx, in, info, handler) +type QuerySimulateMultiHopSwapRequest struct { + Msg *MsgMultiHopSwap `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"` } -func _Query_LimitOrderTrancheUserAllByAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllLimitOrderTrancheUserByAddressRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, req.(*QueryAllLimitOrderTrancheUserByAddressRequest)) +func (m *QuerySimulateMultiHopSwapRequest) Reset() { *m = QuerySimulateMultiHopSwapRequest{} } +func (m *QuerySimulateMultiHopSwapRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateMultiHopSwapRequest) ProtoMessage() {} +func (*QuerySimulateMultiHopSwapRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{45} +} +func (m *QuerySimulateMultiHopSwapRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateMultiHopSwapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateMultiHopSwapRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - return interceptor(ctx, in, info, handler) +} +func (m *QuerySimulateMultiHopSwapRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateMultiHopSwapRequest.Merge(m, src) +} +func (m *QuerySimulateMultiHopSwapRequest) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateMultiHopSwapRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateMultiHopSwapRequest.DiscardUnknown(m) } -func _Query_LimitOrderTranche_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetLimitOrderTrancheRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(QueryServer).LimitOrderTranche(ctx, in) +var xxx_messageInfo_QuerySimulateMultiHopSwapRequest proto.InternalMessageInfo + +func (m *QuerySimulateMultiHopSwapRequest) GetMsg() *MsgMultiHopSwap { + if m != nil { + return m.Msg } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/LimitOrderTranche", + return nil +} + +type QuerySimulateMultiHopSwapResponse struct { + Resp *MsgMultiHopSwapResponse `protobuf:"bytes,1,opt,name=resp,proto3" json:"resp,omitempty"` +} + +func (m *QuerySimulateMultiHopSwapResponse) Reset() { *m = QuerySimulateMultiHopSwapResponse{} } +func (m *QuerySimulateMultiHopSwapResponse) String() string { return proto.CompactTextString(m) } +func (*QuerySimulateMultiHopSwapResponse) ProtoMessage() {} +func (*QuerySimulateMultiHopSwapResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_b6613ea5fce61e9c, []int{46} +} +func (m *QuerySimulateMultiHopSwapResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QuerySimulateMultiHopSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QuerySimulateMultiHopSwapResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LimitOrderTranche(ctx, req.(*QueryGetLimitOrderTrancheRequest)) +} +func (m *QuerySimulateMultiHopSwapResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySimulateMultiHopSwapResponse.Merge(m, src) +} +func (m *QuerySimulateMultiHopSwapResponse) XXX_Size() int { + return m.Size() +} +func (m *QuerySimulateMultiHopSwapResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySimulateMultiHopSwapResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QuerySimulateMultiHopSwapResponse proto.InternalMessageInfo + +func (m *QuerySimulateMultiHopSwapResponse) GetResp() *MsgMultiHopSwapResponse { + if m != nil { + return m.Resp } - return interceptor(ctx, in, info, handler) + return nil } -func _Query_LimitOrderTrancheAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllLimitOrderTrancheRequest) - if err := dec(in); err != nil { +func init() { + proto.RegisterType((*QueryParamsRequest)(nil), "neutron.dex.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "neutron.dex.QueryParamsResponse") + proto.RegisterType((*QueryGetLimitOrderTrancheUserRequest)(nil), "neutron.dex.QueryGetLimitOrderTrancheUserRequest") + proto.RegisterType((*QueryGetLimitOrderTrancheUserResponse)(nil), "neutron.dex.QueryGetLimitOrderTrancheUserResponse") + proto.RegisterType((*QueryAllLimitOrderTrancheUserRequest)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserRequest") + proto.RegisterType((*QueryAllLimitOrderTrancheUserResponse)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserResponse") + proto.RegisterType((*QueryGetLimitOrderTrancheRequest)(nil), "neutron.dex.QueryGetLimitOrderTrancheRequest") + proto.RegisterType((*QueryGetLimitOrderTrancheResponse)(nil), "neutron.dex.QueryGetLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllLimitOrderTrancheRequest)(nil), "neutron.dex.QueryAllLimitOrderTrancheRequest") + proto.RegisterType((*QueryAllLimitOrderTrancheResponse)(nil), "neutron.dex.QueryAllLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllUserDepositsRequest)(nil), "neutron.dex.QueryAllUserDepositsRequest") + proto.RegisterType((*QueryAllUserDepositsResponse)(nil), "neutron.dex.QueryAllUserDepositsResponse") + proto.RegisterType((*QueryAllLimitOrderTrancheUserByAddressRequest)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserByAddressRequest") + proto.RegisterType((*QueryAllLimitOrderTrancheUserByAddressResponse)(nil), "neutron.dex.QueryAllLimitOrderTrancheUserByAddressResponse") + proto.RegisterType((*QueryAllTickLiquidityRequest)(nil), "neutron.dex.QueryAllTickLiquidityRequest") + proto.RegisterType((*QueryAllTickLiquidityResponse)(nil), "neutron.dex.QueryAllTickLiquidityResponse") + proto.RegisterType((*QueryGetInactiveLimitOrderTrancheRequest)(nil), "neutron.dex.QueryGetInactiveLimitOrderTrancheRequest") + proto.RegisterType((*QueryGetInactiveLimitOrderTrancheResponse)(nil), "neutron.dex.QueryGetInactiveLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllInactiveLimitOrderTrancheRequest)(nil), "neutron.dex.QueryAllInactiveLimitOrderTrancheRequest") + proto.RegisterType((*QueryAllInactiveLimitOrderTrancheResponse)(nil), "neutron.dex.QueryAllInactiveLimitOrderTrancheResponse") + proto.RegisterType((*QueryAllPoolReservesRequest)(nil), "neutron.dex.QueryAllPoolReservesRequest") + proto.RegisterType((*QueryAllPoolReservesResponse)(nil), "neutron.dex.QueryAllPoolReservesResponse") + proto.RegisterType((*QueryGetPoolReservesRequest)(nil), "neutron.dex.QueryGetPoolReservesRequest") + proto.RegisterType((*QueryGetPoolReservesResponse)(nil), "neutron.dex.QueryGetPoolReservesResponse") + proto.RegisterType((*QueryEstimateMultiHopSwapRequest)(nil), "neutron.dex.QueryEstimateMultiHopSwapRequest") + proto.RegisterType((*QueryEstimateMultiHopSwapResponse)(nil), "neutron.dex.QueryEstimateMultiHopSwapResponse") + proto.RegisterType((*QueryEstimatePlaceLimitOrderRequest)(nil), "neutron.dex.QueryEstimatePlaceLimitOrderRequest") + proto.RegisterType((*QueryEstimatePlaceLimitOrderResponse)(nil), "neutron.dex.QueryEstimatePlaceLimitOrderResponse") + proto.RegisterType((*QueryPoolRequest)(nil), "neutron.dex.QueryPoolRequest") + proto.RegisterType((*QueryPoolByIDRequest)(nil), "neutron.dex.QueryPoolByIDRequest") + proto.RegisterType((*QueryPoolResponse)(nil), "neutron.dex.QueryPoolResponse") + proto.RegisterType((*QueryGetPoolMetadataRequest)(nil), "neutron.dex.QueryGetPoolMetadataRequest") + proto.RegisterType((*QueryGetPoolMetadataResponse)(nil), "neutron.dex.QueryGetPoolMetadataResponse") + proto.RegisterType((*QueryAllPoolMetadataRequest)(nil), "neutron.dex.QueryAllPoolMetadataRequest") + proto.RegisterType((*QueryAllPoolMetadataResponse)(nil), "neutron.dex.QueryAllPoolMetadataResponse") + proto.RegisterType((*QuerySimulateDepositRequest)(nil), "neutron.dex.QuerySimulateDepositRequest") + proto.RegisterType((*QuerySimulateDepositResponse)(nil), "neutron.dex.QuerySimulateDepositResponse") + proto.RegisterType((*QuerySimulateWithdrawalRequest)(nil), "neutron.dex.QuerySimulateWithdrawalRequest") + proto.RegisterType((*QuerySimulateWithdrawalResponse)(nil), "neutron.dex.QuerySimulateWithdrawalResponse") + proto.RegisterType((*QuerySimulatePlaceLimitOrderRequest)(nil), "neutron.dex.QuerySimulatePlaceLimitOrderRequest") + proto.RegisterType((*QuerySimulatePlaceLimitOrderResponse)(nil), "neutron.dex.QuerySimulatePlaceLimitOrderResponse") + proto.RegisterType((*QuerySimulateWithdrawFilledLimitOrderRequest)(nil), "neutron.dex.QuerySimulateWithdrawFilledLimitOrderRequest") + proto.RegisterType((*QuerySimulateWithdrawFilledLimitOrderResponse)(nil), "neutron.dex.QuerySimulateWithdrawFilledLimitOrderResponse") + proto.RegisterType((*QuerySimulateCancelLimitOrderRequest)(nil), "neutron.dex.QuerySimulateCancelLimitOrderRequest") + proto.RegisterType((*QuerySimulateCancelLimitOrderResponse)(nil), "neutron.dex.QuerySimulateCancelLimitOrderResponse") + proto.RegisterType((*QuerySimulateMultiHopSwapRequest)(nil), "neutron.dex.QuerySimulateMultiHopSwapRequest") + proto.RegisterType((*QuerySimulateMultiHopSwapResponse)(nil), "neutron.dex.QuerySimulateMultiHopSwapResponse") +} + +func init() { proto.RegisterFile("neutron/dex/query.proto", fileDescriptor_b6613ea5fce61e9c) } + +var fileDescriptor_b6613ea5fce61e9c = []byte{ + // 2744 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xef, 0x6f, 0x1c, 0x47, + 0xf9, 0xcf, 0xf8, 0x5c, 0xc7, 0x1e, 0x3b, 0xb1, 0x33, 0x76, 0xea, 0xcb, 0xc5, 0xf1, 0xd9, 0xdb, + 0xa6, 0x76, 0xd2, 0xf8, 0x36, 0x76, 0xbf, 0x49, 0xd3, 0xe4, 0x5b, 0x20, 0xae, 0x9b, 0xc4, 0xb4, + 0x21, 0x66, 0x13, 0xda, 0x24, 0x14, 0xad, 0xd6, 0x77, 0x13, 0x7b, 0xf1, 0xde, 0xee, 0x66, 0x77, + 0x2e, 0xf6, 0x29, 0xca, 0x9b, 0xf6, 0x0d, 0x42, 0x20, 0x05, 0xca, 0x0f, 0xa5, 0x48, 0xe5, 0x05, + 0x02, 0x09, 0x21, 0x54, 0x7e, 0x89, 0x77, 0xbc, 0x41, 0x02, 0x55, 0x08, 0xa1, 0x4a, 0xe5, 0x05, + 0x02, 0xc9, 0xa0, 0x84, 0x57, 0xe1, 0x0d, 0xf2, 0x5f, 0x80, 0x66, 0xf6, 0xd9, 0xf3, 0xee, 0xed, + 0xec, 0xed, 0xd9, 0x39, 0x50, 0x5f, 0xf9, 0x76, 0xe6, 0x99, 0x99, 0xcf, 0xf3, 0x99, 0x67, 0xe6, + 0x99, 0xf9, 0x8c, 0xf1, 0xa8, 0x4d, 0x6b, 0xcc, 0x73, 0x6c, 0xb5, 0x42, 0x37, 0xd4, 0xdb, 0x35, + 0xea, 0xd5, 0x4b, 0xae, 0xe7, 0x30, 0x87, 0xf4, 0x43, 0x45, 0xa9, 0x42, 0x37, 0x0a, 0xc7, 0xcb, + 0x8e, 0x5f, 0x75, 0x7c, 0x75, 0xd9, 0xf0, 0x69, 0x60, 0xa5, 0xde, 0x99, 0x5d, 0xa6, 0xcc, 0x98, + 0x55, 0x5d, 0x63, 0xc5, 0xb4, 0x0d, 0x66, 0x3a, 0x76, 0xd0, 0xb0, 0x30, 0x1e, 0xb5, 0x0d, 0xad, + 0xca, 0x8e, 0x19, 0xd6, 0x8f, 0xac, 0x38, 0x2b, 0x8e, 0xf8, 0xa9, 0xf2, 0x5f, 0x50, 0x3a, 0xb6, + 0xe2, 0x38, 0x2b, 0x16, 0x55, 0x0d, 0xd7, 0x54, 0x0d, 0xdb, 0x76, 0x98, 0xe8, 0xd2, 0x87, 0xda, + 0x22, 0xd4, 0x8a, 0xaf, 0xe5, 0xda, 0x2d, 0x95, 0x99, 0x55, 0xea, 0x33, 0xa3, 0xea, 0x82, 0xc1, + 0x44, 0xd4, 0x8d, 0x0a, 0x75, 0x1d, 0xdf, 0x64, 0xba, 0x47, 0xcb, 0x8e, 0x57, 0x01, 0x8b, 0xa3, + 0x51, 0x0b, 0xcb, 0xac, 0x9a, 0x4c, 0x77, 0xbc, 0x0a, 0xf5, 0x74, 0xe6, 0x19, 0x76, 0x79, 0x95, + 0x82, 0xd9, 0xf1, 0x0c, 0x33, 0xbd, 0xe6, 0x53, 0x0f, 0x6c, 0xf3, 0x51, 0x5b, 0xd7, 0xf0, 0x8c, + 0x6a, 0x88, 0xf7, 0xe9, 0x58, 0x8d, 0xe3, 0x58, 0xa1, 0x1f, 0xcd, 0xe5, 0x7a, 0x95, 0x32, 0xa3, + 0x62, 0x30, 0x23, 0xd5, 0xc0, 0xa3, 0x3e, 0xf5, 0xee, 0x50, 0x5f, 0xe6, 0x28, 0x33, 0xcb, 0x6b, + 0xba, 0x65, 0xde, 0xae, 0x99, 0x15, 0x93, 0xd5, 0x43, 0x7e, 0x63, 0x16, 0x1b, 0x41, 0xa9, 0x32, + 0x82, 0xc9, 0xe7, 0xf9, 0xbc, 0x2d, 0x09, 0x98, 0x1a, 0xbd, 0x5d, 0xa3, 0x3e, 0x53, 0x2e, 0xe1, + 0xe1, 0x58, 0xa9, 0xef, 0x3a, 0xb6, 0x4f, 0xc9, 0x2c, 0xee, 0x09, 0xdc, 0xc9, 0xa3, 0x09, 0x34, + 0xdd, 0x3f, 0x37, 0x5c, 0x8a, 0x04, 0x43, 0x29, 0x30, 0x9e, 0xef, 0xfe, 0x70, 0xb3, 0xb8, 0x47, + 0x03, 0x43, 0xe5, 0x7b, 0x08, 0x3f, 0x2b, 0xba, 0xba, 0x48, 0xd9, 0xeb, 0x9c, 0xb6, 0x2b, 0x9c, + 0xb5, 0x6b, 0x01, 0x69, 0x5f, 0xf0, 0xa9, 0x07, 0x43, 0x92, 0x3c, 0xde, 0x6b, 0x54, 0x2a, 0x1e, + 0xf5, 0x83, 0xce, 0xfb, 0xb4, 0xf0, 0x93, 0x14, 0x71, 0x7f, 0x48, 0xf2, 0x1a, 0xad, 0xe7, 0xbb, + 0x44, 0x2d, 0x86, 0xa2, 0xd7, 0x68, 0x9d, 0x9c, 0xc1, 0xf9, 0xb2, 0x61, 0x95, 0xf5, 0x75, 0x93, + 0xad, 0x56, 0x3c, 0x63, 0xdd, 0x58, 0xb6, 0xa8, 0xee, 0xaf, 0x1a, 0x1e, 0xf5, 0xf3, 0xb9, 0x09, + 0x34, 0xdd, 0xab, 0x3d, 0xcd, 0xeb, 0xdf, 0x8c, 0x54, 0x5f, 0x15, 0xb5, 0xca, 0xfd, 0x2e, 0x7c, + 0x34, 0x03, 0x1d, 0xb8, 0x6e, 0xe0, 0x7c, 0xda, 0xac, 0x03, 0x19, 0x4a, 0x8c, 0x0c, 0x69, 0x6f, + 0x82, 0x1b, 0xa4, 0x1d, 0xb4, 0x64, 0x95, 0xe4, 0x1d, 0x84, 0x87, 0x65, 0x2e, 0x08, 0x87, 0xe7, + 0x35, 0xde, 0xf4, 0xaf, 0x9b, 0xc5, 0x83, 0xc1, 0x32, 0xf2, 0x2b, 0x6b, 0x25, 0xd3, 0x51, 0xab, + 0x06, 0x5b, 0x2d, 0x2d, 0xda, 0xec, 0xf1, 0x66, 0x51, 0xd6, 0x76, 0x6b, 0xb3, 0x58, 0xa8, 0x1b, + 0x55, 0xeb, 0xac, 0x22, 0xa9, 0x54, 0x34, 0xb2, 0x9e, 0xa4, 0xc4, 0x86, 0xf9, 0x3a, 0x6f, 0x59, + 0x2d, 0xe7, 0xeb, 0x02, 0xc6, 0xdb, 0x4b, 0x1c, 0x28, 0x78, 0xae, 0x14, 0x80, 0x2b, 0xf1, 0x35, + 0x5e, 0x0a, 0x76, 0x0d, 0x58, 0xe9, 0xa5, 0x25, 0x63, 0x85, 0x42, 0x5b, 0x2d, 0xd2, 0x52, 0xf9, + 0x18, 0xc1, 0x14, 0xa4, 0x0f, 0xd8, 0xd6, 0x14, 0xe4, 0x3a, 0x31, 0x05, 0x17, 0x63, 0x4e, 0x75, + 0x09, 0xa7, 0xa6, 0x32, 0x9d, 0x0a, 0xf0, 0xc5, 0xbc, 0xfa, 0x0e, 0xc2, 0x13, 0xa9, 0x81, 0x15, + 0x52, 0x38, 0x8a, 0xf7, 0xba, 0x86, 0xe9, 0xe9, 0x66, 0x05, 0x42, 0xbe, 0x87, 0x7f, 0x2e, 0x56, + 0xc8, 0x11, 0x8c, 0xc5, 0x12, 0x36, 0xed, 0x0a, 0xdd, 0x10, 0x30, 0x72, 0x5a, 0x1f, 0x2f, 0x59, + 0xe4, 0x05, 0xe4, 0x10, 0xee, 0x65, 0xce, 0x1a, 0xb5, 0x75, 0xd3, 0x16, 0xf1, 0xdd, 0xa7, 0xed, + 0x15, 0xdf, 0x8b, 0x76, 0xf3, 0x5a, 0xe9, 0x6e, 0x5e, 0x2b, 0x4a, 0x1d, 0x4f, 0xb6, 0xc0, 0x05, + 0x4c, 0x5f, 0xc3, 0xc3, 0x12, 0xa6, 0x61, 0x92, 0xc7, 0x5b, 0x93, 0x0c, 0x04, 0x1f, 0x48, 0x10, + 0xac, 0xbc, 0x1f, 0x72, 0x22, 0x9b, 0xe9, 0x4c, 0x4e, 0xa2, 0x4e, 0x77, 0xc5, 0x9d, 0x8e, 0x87, + 0x62, 0x6e, 0xd7, 0xa1, 0xf8, 0x5b, 0x04, 0xe4, 0xc8, 0x01, 0x66, 0x91, 0x93, 0x7b, 0x02, 0x72, + 0x3a, 0x17, 0x79, 0x3f, 0x41, 0xf8, 0x70, 0xe8, 0x04, 0x8f, 0xe9, 0x85, 0x20, 0xe9, 0xf9, 0xd9, + 0xfb, 0xec, 0x05, 0x09, 0x84, 0x5d, 0xd0, 0x48, 0x8e, 0xe3, 0x03, 0xa6, 0x5d, 0xb6, 0x6a, 0x15, + 0xaa, 0x8b, 0x4c, 0xc5, 0xd3, 0x18, 0xec, 0xc3, 0x83, 0x50, 0xb1, 0xe4, 0x38, 0xd6, 0x82, 0xc1, + 0x0c, 0xe5, 0x87, 0x08, 0x8f, 0xc9, 0xd1, 0x02, 0xdb, 0xff, 0x8f, 0x7b, 0x21, 0x6d, 0xfb, 0x40, + 0x71, 0x21, 0x46, 0x31, 0x34, 0xd0, 0x44, 0x4a, 0x07, 0x7a, 0x1b, 0x2d, 0x3a, 0xc7, 0xea, 0x37, + 0x10, 0x9e, 0x69, 0xb9, 0x4b, 0xcd, 0xd7, 0xcf, 0x07, 0x34, 0xfe, 0xcf, 0x78, 0x56, 0x7e, 0x8f, + 0x70, 0xa9, 0x5d, 0x4c, 0xc0, 0xe6, 0x6b, 0x78, 0x20, 0x12, 0xbb, 0xfe, 0x8e, 0xb7, 0xcd, 0xfe, + 0xed, 0xc0, 0xed, 0x20, 0xb9, 0xef, 0x45, 0x82, 0xe0, 0x9a, 0x59, 0x5e, 0x7b, 0x3d, 0x3c, 0xb9, + 0x7c, 0x12, 0x36, 0x85, 0x9f, 0x23, 0x7c, 0x24, 0x05, 0x1c, 0x90, 0x7a, 0x11, 0xef, 0x8f, 0x1f, + 0xb8, 0xa4, 0x81, 0x1a, 0x6b, 0x0b, 0x74, 0xee, 0x63, 0xd1, 0xc2, 0xce, 0x11, 0xfa, 0x3e, 0xc2, + 0xd3, 0xe1, 0x2e, 0xbf, 0x68, 0x1b, 0x65, 0x66, 0xde, 0xa1, 0x1d, 0xdd, 0x71, 0xe3, 0x09, 0x2a, + 0xd7, 0x9c, 0xa0, 0x32, 0xb3, 0xd0, 0x37, 0x11, 0x3e, 0xd6, 0x06, 0x40, 0x20, 0x98, 0xe2, 0x31, + 0x13, 0x8c, 0xf4, 0x27, 0xcd, 0x4b, 0x87, 0xcc, 0xb4, 0xe1, 0x14, 0x0f, 0x48, 0x3b, 0x6f, 0x59, + 0x99, 0xa4, 0x75, 0xea, 0xf4, 0xf3, 0xb7, 0x90, 0x88, 0xd6, 0x83, 0xb6, 0x4d, 0x44, 0xae, 0x03, + 0x44, 0x74, 0x2e, 0x0e, 0x1f, 0x44, 0x72, 0x11, 0xdf, 0xf2, 0x35, 0xb8, 0xb3, 0x7c, 0x12, 0xd6, + 0xf5, 0x4f, 0x23, 0x9b, 0x4e, 0x1c, 0x1b, 0x90, 0xbd, 0x80, 0xf7, 0xc5, 0x2e, 0x5a, 0xc0, 0xee, + 0xa1, 0xf8, 0x9d, 0x27, 0xd2, 0x12, 0x88, 0x1d, 0x70, 0x23, 0x65, 0x9d, 0xe3, 0xf2, 0xed, 0x90, + 0xcb, 0x8b, 0x94, 0x75, 0x8a, 0xcb, 0x8c, 0x65, 0x3c, 0x84, 0x73, 0xb7, 0x28, 0x15, 0xcb, 0xb7, + 0x5b, 0xe3, 0x3f, 0x95, 0x0a, 0x70, 0x96, 0xc0, 0x90, 0xce, 0x19, 0xda, 0x31, 0x67, 0xca, 0x8f, + 0x73, 0x70, 0x50, 0x7c, 0xd5, 0x67, 0x66, 0xd5, 0x60, 0xf4, 0x72, 0xcd, 0x62, 0xe6, 0x25, 0xc7, + 0xbd, 0xba, 0x6e, 0xb8, 0x91, 0xfc, 0x5a, 0xf6, 0xa8, 0xc1, 0x1c, 0x2f, 0xcc, 0xaf, 0xf0, 0x49, + 0x0a, 0xb8, 0xd7, 0xa3, 0x65, 0x6a, 0xde, 0xa1, 0x1e, 0x38, 0xdc, 0xf8, 0x26, 0x73, 0xb8, 0xc7, + 0x73, 0x6a, 0x4c, 0x5c, 0x0c, 0x93, 0x7b, 0x74, 0x38, 0x8e, 0xc6, 0x4d, 0x34, 0xb0, 0x24, 0x5f, + 0xc4, 0x7d, 0x46, 0xd5, 0xa9, 0xd9, 0x8c, 0x33, 0x28, 0xf6, 0xb2, 0xf9, 0x4f, 0xf1, 0x3b, 0x6e, + 0xab, 0xcb, 0xd8, 0x76, 0x8b, 0xad, 0xcd, 0xe2, 0x50, 0x70, 0x05, 0x6b, 0x14, 0x29, 0x5a, 0x6f, + 0xf0, 0x7b, 0xd1, 0x26, 0xdf, 0x46, 0x78, 0x88, 0x6e, 0x98, 0x0c, 0xd6, 0xb3, 0xeb, 0x99, 0x65, + 0x9a, 0x7f, 0x4a, 0x0c, 0xb2, 0x06, 0x83, 0xfc, 0xdf, 0x8a, 0xc9, 0x56, 0x6b, 0xcb, 0xa5, 0xb2, + 0x53, 0x55, 0x01, 0xed, 0x8c, 0xe3, 0xad, 0x84, 0xbf, 0xd5, 0x3b, 0xa7, 0xd4, 0x1a, 0x33, 0x2d, + 0x3f, 0x18, 0x7f, 0xc9, 0xa3, 0xe5, 0x05, 0x5a, 0x7e, 0xbc, 0x59, 0x4c, 0xf4, 0xbb, 0xb5, 0x59, + 0x1c, 0x0d, 0xa0, 0x34, 0xd7, 0x28, 0xda, 0x7e, 0x5e, 0x24, 0xb6, 0x82, 0x25, 0x5e, 0x40, 0x9e, + 0xc3, 0x83, 0x2e, 0x0f, 0x8d, 0x65, 0xea, 0x33, 0x5d, 0x10, 0x91, 0xef, 0x11, 0x47, 0xb8, 0x7d, + 0xbc, 0x78, 0x9e, 0xaf, 0x26, 0x5e, 0xc8, 0x2f, 0x3a, 0x93, 0x2d, 0xe6, 0x0a, 0xe2, 0xe2, 0x36, + 0xee, 0x2d, 0x3b, 0xa6, 0xad, 0x3b, 0x35, 0xd6, 0x08, 0x89, 0xe8, 0x1a, 0x08, 0xa3, 0xff, 0x15, + 0xc7, 0xb4, 0xe7, 0xcf, 0x81, 0xdf, 0x53, 0x11, 0xbf, 0x41, 0x3b, 0x0a, 0xfe, 0xcc, 0xf8, 0x95, + 0x35, 0x95, 0xd5, 0x5d, 0xea, 0x8b, 0x06, 0x8f, 0x37, 0x8b, 0x8d, 0xde, 0xb5, 0xbd, 0xfc, 0xd7, + 0x95, 0x1a, 0x53, 0xde, 0xeb, 0xc6, 0xcf, 0xc4, 0x80, 0x2d, 0x59, 0x46, 0x39, 0xb2, 0xd9, 0x3d, + 0x59, 0x1c, 0xb5, 0xb8, 0x82, 0x1d, 0xc6, 0x7d, 0x41, 0x15, 0x77, 0x36, 0x48, 0x7d, 0x81, 0xed, + 0x95, 0x1a, 0x23, 0x25, 0x3c, 0xb2, 0xbd, 0xe2, 0x74, 0xd3, 0xd6, 0x99, 0x23, 0xec, 0x9e, 0x12, + 0x6b, 0x6f, 0xa8, 0xb1, 0xf6, 0x16, 0xed, 0x6b, 0x0e, 0xb7, 0x8f, 0xc5, 0x5e, 0x4f, 0x87, 0x63, + 0xef, 0x2c, 0xc6, 0x90, 0x3f, 0xea, 0x2e, 0xcd, 0xef, 0x9d, 0x40, 0xd3, 0xfb, 0xe7, 0x0e, 0xa7, + 0x25, 0x8f, 0xba, 0x4b, 0xb5, 0x3e, 0x27, 0xfc, 0x49, 0x2e, 0xe3, 0x41, 0xba, 0xe1, 0x9a, 0x9e, + 0xd8, 0x9c, 0x74, 0x66, 0x56, 0x69, 0xbe, 0x57, 0x4c, 0x6c, 0xa1, 0x14, 0x68, 0x72, 0xa5, 0x50, + 0x93, 0x2b, 0x5d, 0x0b, 0x35, 0xb9, 0xf9, 0x5e, 0xbe, 0xd8, 0xef, 0xff, 0xbd, 0x88, 0x78, 0xb8, + 0x85, 0x8d, 0x79, 0x35, 0xa9, 0xe2, 0x7d, 0x55, 0x63, 0xe3, 0x7c, 0x80, 0x92, 0x13, 0xd2, 0x27, + 0x7c, 0xbd, 0x94, 0x25, 0x7a, 0xec, 0xaf, 0x1a, 0x1b, 0xba, 0xd1, 0x68, 0xb6, 0xb5, 0x59, 0x3c, + 0x18, 0x38, 0x1c, 0x2f, 0x57, 0xb4, 0x81, 0x46, 0xf7, 0x3c, 0x38, 0xfe, 0x9d, 0x03, 0x95, 0x23, + 0x35, 0x38, 0x20, 0x70, 0xbf, 0x8b, 0xf0, 0x3e, 0xe6, 0x30, 0xc3, 0xe2, 0x73, 0xc5, 0x43, 0x2b, + 0x3b, 0x7c, 0xaf, 0xef, 0x3c, 0x7c, 0xe3, 0x43, 0x6c, 0x6d, 0x16, 0x47, 0x02, 0x27, 0x62, 0xc5, + 0x8a, 0xd6, 0x2f, 0xbe, 0x17, 0x6d, 0xde, 0x8a, 0xbc, 0x8b, 0xf0, 0x80, 0xbf, 0x6e, 0xb8, 0x0d, + 0x60, 0x5d, 0x59, 0xc0, 0xde, 0xd8, 0x39, 0xb0, 0xd8, 0x08, 0x5b, 0x9b, 0xc5, 0xe1, 0x00, 0x57, + 0xb4, 0x54, 0xd1, 0x30, 0xff, 0x04, 0x54, 0x9c, 0x2f, 0x51, 0xeb, 0xd4, 0x58, 0x00, 0x2b, 0xf7, + 0xdf, 0xe0, 0x2b, 0x36, 0xc4, 0x36, 0x5f, 0xb1, 0x62, 0x45, 0xeb, 0xe7, 0xdf, 0x57, 0x6a, 0x8c, + 0xb7, 0x52, 0xde, 0xc2, 0x43, 0x81, 0xa4, 0x29, 0x32, 0xcd, 0x93, 0x09, 0x30, 0x90, 0x18, 0x73, + 0xdb, 0x89, 0x51, 0xc5, 0x23, 0x8d, 0xde, 0xe7, 0xeb, 0x8b, 0x0b, 0xd1, 0x11, 0x78, 0x42, 0x84, + 0x11, 0xba, 0xb5, 0x1e, 0xfe, 0xb9, 0x58, 0x51, 0x3e, 0x83, 0x0f, 0x44, 0xe0, 0x40, 0xb4, 0x3d, + 0x8f, 0xbb, 0x79, 0x35, 0xc4, 0xd8, 0x81, 0x44, 0xd6, 0x84, 0x6c, 0x29, 0x8c, 0x94, 0x99, 0xf8, + 0x79, 0xe0, 0x32, 0x08, 0xc6, 0xe1, 0xc8, 0xfb, 0x71, 0x57, 0x63, 0xd0, 0x2e, 0xb3, 0xd2, 0x9c, + 0xba, 0xb7, 0xcd, 0xb7, 0x53, 0xf7, 0x52, 0x54, 0x78, 0x4e, 0x4d, 0xdd, 0x61, 0x4b, 0x10, 0x7a, + 0x07, 0xa2, 0x65, 0x0a, 0x8d, 0x1f, 0xf8, 0x9a, 0x41, 0x75, 0xea, 0xd8, 0xdc, 0x7c, 0x78, 0x93, + 0x79, 0xe3, 0x36, 0x79, 0x93, 0x6b, 0xcb, 0x1b, 0x37, 0x52, 0xd6, 0xb9, 0xc3, 0xdb, 0x25, 0xa0, + 0xe5, 0xaa, 0x59, 0xad, 0x59, 0x06, 0xa3, 0x0d, 0xd5, 0x22, 0xa0, 0xe5, 0x18, 0xce, 0x55, 0xfd, + 0x15, 0xe0, 0x63, 0x34, 0x7e, 0x24, 0xf1, 0x57, 0x42, 0x63, 0x6e, 0xa3, 0x5c, 0x05, 0xc7, 0x13, + 0x3d, 0x81, 0xe3, 0x2f, 0xe0, 0x6e, 0x8f, 0xfa, 0x2e, 0xf4, 0x55, 0x4c, 0xeb, 0x2b, 0x04, 0x29, + 0x8c, 0x95, 0xcf, 0xe1, 0xf1, 0x58, 0xa7, 0x0d, 0xa5, 0xbc, 0xb1, 0x52, 0x4e, 0x44, 0x11, 0x16, + 0x9a, 0x7b, 0x8d, 0xd8, 0x0b, 0x90, 0x37, 0x70, 0x31, 0xb5, 0x3f, 0xc0, 0x79, 0x3a, 0x86, 0x53, + 0x69, 0xd1, 0x63, 0x1c, 0xea, 0x75, 0xc8, 0xea, 0x61, 0xd7, 0x29, 0x59, 0x7d, 0x36, 0x8a, 0x37, + 0xc1, 0x42, 0x73, 0x23, 0x01, 0xba, 0x0c, 0x29, 0x21, 0xb5, 0x67, 0x40, 0x7e, 0x2e, 0x86, 0x7c, + 0x2a, 0xab, 0xef, 0x38, 0xfc, 0x2f, 0xe3, 0x13, 0x52, 0x66, 0x2e, 0x98, 0x96, 0x45, 0x2b, 0x49, + 0x3f, 0xce, 0x46, 0xfd, 0x98, 0x4e, 0x63, 0x29, 0xd1, 0x5a, 0x38, 0x54, 0x03, 0xc9, 0x2a, 0x7b, + 0xac, 0xc6, 0xa2, 0x89, 0x7a, 0x76, 0xb2, 0xed, 0xd1, 0xe2, 0x2e, 0xde, 0x6c, 0xe2, 0xf1, 0x15, + 0xc3, 0x2e, 0x53, 0x2b, 0xe9, 0xda, 0x5c, 0xd4, 0xb5, 0x89, 0xe6, 0xc1, 0x12, 0xad, 0x84, 0x4b, + 0x14, 0xde, 0x0a, 0xd2, 0xfb, 0x6e, 0xc8, 0x86, 0x51, 0x57, 0xa6, 0x33, 0x7b, 0x8f, 0xbb, 0xa0, + 0xc1, 0xfd, 0x23, 0x1c, 0x46, 0x76, 0xff, 0x28, 0x45, 0xe1, 0x8f, 0x35, 0x0f, 0x10, 0x6b, 0x21, + 0xa0, 0x7f, 0x09, 0xce, 0xc9, 0xf2, 0x3e, 0x01, 0xf6, 0x99, 0x18, 0xec, 0x67, 0x5b, 0xf6, 0x1a, + 0x83, 0x3c, 0xf7, 0xce, 0x24, 0x7e, 0x4a, 0xf4, 0x4f, 0x56, 0x71, 0x4f, 0xf0, 0x12, 0x47, 0xe2, + 0x71, 0x9f, 0x7c, 0xe6, 0x2b, 0x4c, 0xa4, 0x1b, 0x04, 0x9d, 0x2b, 0x87, 0xdf, 0xfe, 0xf8, 0x9f, + 0xef, 0x76, 0x1d, 0x24, 0xc3, 0x6a, 0xf2, 0x4d, 0x93, 0xfc, 0x0e, 0xe1, 0x83, 0x52, 0xb5, 0x90, + 0xcc, 0x26, 0x3b, 0xce, 0x78, 0xff, 0x2b, 0xcc, 0xed, 0xa4, 0x09, 0xa0, 0x7b, 0x55, 0xa0, 0xfb, + 0x34, 0x79, 0x59, 0x6d, 0xe7, 0x75, 0x56, 0xbd, 0x0b, 0x0a, 0xec, 0x3d, 0xf5, 0x6e, 0x44, 0x9e, + 0xba, 0x47, 0x7e, 0x86, 0x70, 0x5e, 0x3a, 0xd0, 0x79, 0xcb, 0x92, 0xb9, 0x92, 0xf1, 0x34, 0x26, + 0x73, 0x25, 0xeb, 0x71, 0x4b, 0x99, 0x11, 0xae, 0x4c, 0x91, 0xa3, 0x6d, 0xb9, 0x42, 0xfe, 0x84, + 0xf0, 0x64, 0x1a, 0xe4, 0x86, 0xec, 0x4b, 0xce, 0xb6, 0x0f, 0xa4, 0x59, 0xbf, 0x2e, 0x9c, 0xdb, + 0x55, 0x5b, 0xf0, 0xe6, 0xa4, 0xf0, 0xe6, 0x38, 0x99, 0x8e, 0x79, 0x23, 0x26, 0x21, 0xaa, 0x3f, + 0x6f, 0xcf, 0x08, 0xf9, 0x23, 0xc2, 0x07, 0x92, 0x4a, 0xd4, 0x4c, 0x7b, 0x41, 0x11, 0x62, 0x2e, + 0xb5, 0x6b, 0x0e, 0x30, 0xaf, 0x0b, 0x98, 0x1a, 0x59, 0xca, 0x22, 0x5d, 0xbd, 0x0b, 0xe7, 0x44, + 0x1e, 0x3a, 0x70, 0xef, 0xe3, 0x3f, 0x1b, 0x67, 0xc4, 0xe6, 0x90, 0xfa, 0x15, 0xc2, 0x23, 0x89, + 0x71, 0x79, 0x38, 0xcd, 0xb4, 0x47, 0x6b, 0x0b, 0x8f, 0x5a, 0x3d, 0x4e, 0x29, 0x2f, 0x0b, 0x8f, + 0x5e, 0x24, 0xa7, 0x76, 0xe5, 0x11, 0xf9, 0x16, 0xc2, 0x83, 0xd1, 0x67, 0x18, 0x8e, 0x78, 0x5a, + 0x0a, 0x41, 0xf2, 0xb4, 0x54, 0x38, 0xd6, 0x86, 0x25, 0xe0, 0x3c, 0x21, 0x70, 0x3e, 0x47, 0x9e, + 0x4d, 0x06, 0x48, 0xf8, 0x78, 0x13, 0x09, 0x8e, 0x1f, 0x20, 0x3c, 0x14, 0xd3, 0xcf, 0x39, 0x2e, + 0xf9, 0x68, 0xb2, 0xf7, 0x83, 0xc2, 0xf1, 0x76, 0x4c, 0x01, 0xd9, 0x19, 0x81, 0x6c, 0x8e, 0x9c, + 0x54, 0xd3, 0xff, 0xa3, 0x42, 0x4e, 0xde, 0x1f, 0xba, 0xf0, 0xa1, 0x54, 0x0d, 0x97, 0x9c, 0x92, + 0xc6, 0x66, 0x96, 0xd0, 0x5c, 0x38, 0xbd, 0xd3, 0x66, 0xe0, 0xc6, 0x6f, 0x90, 0xf0, 0xe3, 0xd7, + 0xe8, 0xe6, 0x0d, 0xf2, 0x66, 0xcc, 0x95, 0x5b, 0x22, 0x7d, 0xeb, 0x9d, 0x88, 0xf2, 0x1b, 0xb1, + 0x8e, 0x5b, 0x49, 0xd3, 0x3b, 0xee, 0xfa, 0x5f, 0x08, 0x8f, 0xa5, 0x7a, 0xc9, 0xa7, 0xff, 0x94, + 0x74, 0x4e, 0x77, 0xc3, 0x67, 0x3b, 0xd2, 0xbb, 0xf2, 0x96, 0xa0, 0xf3, 0x8d, 0x9b, 0xc7, 0xc8, + 0x54, 0x9b, 0x6c, 0x92, 0x63, 0x6d, 0xb3, 0x43, 0xbe, 0x8f, 0xf0, 0x60, 0x54, 0x16, 0x4d, 0x5f, + 0x77, 0x12, 0xe9, 0x37, 0x65, 0xdd, 0xc9, 0x04, 0x5a, 0xe5, 0x45, 0xe1, 0xc6, 0x2c, 0x51, 0xd5, + 0xd4, 0x7f, 0x28, 0x92, 0x07, 0xf7, 0x07, 0x08, 0x0f, 0x44, 0x7b, 0x94, 0xc1, 0x93, 0x2b, 0xd3, + 0x32, 0x78, 0x29, 0xfa, 0xb1, 0xf2, 0x59, 0x01, 0x6f, 0x81, 0xcc, 0xef, 0x10, 0x5e, 0x53, 0x24, + 0xdd, 0xa2, 0xf4, 0x1e, 0xf9, 0x11, 0xc2, 0x23, 0x32, 0x51, 0x52, 0xb6, 0x05, 0xb7, 0x10, 0x9a, + 0x65, 0x5b, 0x70, 0x2b, 0xad, 0x53, 0x51, 0xa5, 0x5b, 0x1b, 0x85, 0x26, 0x7a, 0x95, 0xb7, 0xd1, + 0x57, 0x1d, 0x57, 0xf7, 0xd7, 0x0d, 0xf7, 0x2b, 0x5d, 0x88, 0xfc, 0x02, 0xe1, 0xd1, 0x14, 0x1d, + 0x8a, 0x9c, 0x4c, 0x1f, 0x5c, 0x7e, 0xf3, 0x29, 0xcc, 0xee, 0xa0, 0x05, 0x20, 0x9e, 0x13, 0x88, + 0x9b, 0x23, 0xbb, 0x81, 0xd8, 0xe5, 0xcd, 0xa2, 0x61, 0xcb, 0x41, 0xdf, 0xc3, 0xdd, 0x7c, 0x06, + 0xc9, 0x11, 0xc9, 0x11, 0x72, 0x5b, 0x61, 0x29, 0x8c, 0xa7, 0x55, 0xc3, 0xd0, 0xa7, 0xc5, 0xd0, + 0x27, 0x49, 0x29, 0x31, 0xe1, 0xb1, 0x79, 0x4e, 0x4c, 0xae, 0x87, 0x7b, 0x43, 0xa9, 0x85, 0x4c, + 0xca, 0xc7, 0x88, 0xc8, 0x30, 0x99, 0x30, 0x9e, 0x11, 0x30, 0x8e, 0x90, 0xc3, 0x32, 0x18, 0x81, + 0x7e, 0x73, 0x8f, 0x7c, 0x0d, 0x96, 0x40, 0x43, 0x1e, 0x48, 0x5f, 0x02, 0x4d, 0xba, 0x47, 0x8b, + 0x25, 0xd0, 0xac, 0x5c, 0x28, 0x53, 0x02, 0xca, 0x24, 0x29, 0xaa, 0xa9, 0xff, 0x13, 0xa8, 0xde, + 0xe5, 0x70, 0xbe, 0x0a, 0x7b, 0x46, 0xd8, 0x43, 0xeb, 0x3d, 0xa3, 0x0d, 0x44, 0x29, 0x5a, 0x8a, + 0xa2, 0x08, 0x44, 0x63, 0xa4, 0x90, 0x8e, 0x88, 0x7c, 0x1d, 0xe1, 0xc1, 0x26, 0x49, 0x42, 0x06, + 0x46, 0xae, 0x7f, 0xc8, 0xc0, 0xa4, 0xe8, 0x1b, 0xca, 0x51, 0x01, 0xa6, 0x48, 0x8e, 0xc4, 0xc0, + 0xf8, 0x60, 0xad, 0xc3, 0xe1, 0x81, 0x3c, 0x40, 0x98, 0x24, 0xd5, 0x07, 0xf2, 0x7c, 0xfa, 0x40, + 0x09, 0xcd, 0xa3, 0x70, 0xa2, 0x3d, 0x63, 0x00, 0x36, 0x2d, 0x80, 0x29, 0x64, 0x42, 0x0e, 0x6c, + 0x7d, 0x1b, 0xc4, 0x07, 0x08, 0x8f, 0xa6, 0x88, 0x0c, 0xb2, 0xf5, 0xde, 0x5a, 0xe9, 0x90, 0xad, + 0xf7, 0x0c, 0x05, 0x03, 0x76, 0xa8, 0xe6, 0xf5, 0xde, 0x80, 0x9a, 0x58, 0xef, 0xe4, 0xcf, 0x08, + 0x4f, 0x64, 0xa9, 0x08, 0xe4, 0xa5, 0x6c, 0xba, 0x52, 0x54, 0x8e, 0xc2, 0xd9, 0xdd, 0x34, 0x05, + 0x67, 0x5e, 0x12, 0xce, 0xbc, 0x40, 0x66, 0x5b, 0xf3, 0xae, 0x27, 0x13, 0x35, 0xf9, 0x25, 0xc2, + 0xf9, 0x34, 0x25, 0x81, 0xb4, 0xe0, 0x35, 0x45, 0xd1, 0x90, 0xdd, 0xfb, 0xb2, 0x84, 0x8a, 0x94, + 0x9b, 0x52, 0x03, 0x7e, 0x59, 0xb4, 0x8b, 0xa1, 0x7e, 0x80, 0xf0, 0x88, 0x4c, 0x44, 0x90, 0xe5, + 0xb5, 0x16, 0x02, 0x86, 0x2c, 0xaf, 0xb5, 0xd2, 0x26, 0xda, 0xd9, 0x06, 0xe6, 0x2f, 0x7e, 0xf8, + 0x70, 0x1c, 0x7d, 0xf4, 0x70, 0x1c, 0xfd, 0xe3, 0xe1, 0x38, 0xba, 0xff, 0x68, 0x7c, 0xcf, 0x47, + 0x8f, 0xc6, 0xf7, 0xfc, 0xe5, 0xd1, 0xf8, 0x9e, 0x9b, 0x33, 0xd9, 0x8f, 0x98, 0x1b, 0xc1, 0x49, + 0xbb, 0xee, 0x52, 0x7f, 0xb9, 0x47, 0xbc, 0x1e, 0xbd, 0xf0, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x93, 0xa9, 0x81, 0xfd, 0x87, 0x2e, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// QueryClient is the client API for Query service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type QueryClient interface { + // Parameters queries the parameters of the module. + Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // Queries a LimitOrderTrancheUser by index. + LimitOrderTrancheUser(ctx context.Context, in *QueryGetLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheUserResponse, error) + // Queries a list of LimitOrderTranchUser items. + LimitOrderTrancheUserAll(ctx context.Context, in *QueryAllLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserResponse, error) + // Queries a list of LimitOrderTrancheUser items for a given address. + LimitOrderTrancheUserAllByAddress(ctx context.Context, in *QueryAllLimitOrderTrancheUserByAddressRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) + // Queries a LimitOrderTranche by index. + LimitOrderTranche(ctx context.Context, in *QueryGetLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheResponse, error) + // Queries a list of LimitOrderTranche items for a given pairID / TokenIn + // combination. + LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheResponse, error) + // Queries a list of UserDeposits items. + UserDepositsAll(ctx context.Context, in *QueryAllUserDepositsRequest, opts ...grpc.CallOption) (*QueryAllUserDepositsResponse, error) + // Queries a list of TickLiquidity items. + TickLiquidityAll(ctx context.Context, in *QueryAllTickLiquidityRequest, opts ...grpc.CallOption) (*QueryAllTickLiquidityResponse, error) + // Queries a InactiveLimitOrderTranche by index. + InactiveLimitOrderTranche(ctx context.Context, in *QueryGetInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetInactiveLimitOrderTrancheResponse, error) + // Queries a list of InactiveLimitOrderTranche items. + InactiveLimitOrderTrancheAll(ctx context.Context, in *QueryAllInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllInactiveLimitOrderTrancheResponse, error) + // Queries a list of PoolReserves items. + PoolReservesAll(ctx context.Context, in *QueryAllPoolReservesRequest, opts ...grpc.CallOption) (*QueryAllPoolReservesResponse, error) + // Queries a PoolReserve by index + PoolReserves(ctx context.Context, in *QueryGetPoolReservesRequest, opts ...grpc.CallOption) (*QueryGetPoolReservesResponse, error) + // DEPRECATED Queries the simulated result of a multihop swap + EstimateMultiHopSwap(ctx context.Context, in *QueryEstimateMultiHopSwapRequest, opts ...grpc.CallOption) (*QueryEstimateMultiHopSwapResponse, error) + // DEPRECATED Queries the simulated result of a PlaceLimit order + EstimatePlaceLimitOrder(ctx context.Context, in *QueryEstimatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QueryEstimatePlaceLimitOrderResponse, error) + // Queries a pool by pair, tick and fee + Pool(ctx context.Context, in *QueryPoolRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) + // Queries a pool by ID + PoolByID(ctx context.Context, in *QueryPoolByIDRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) + // Queries a PoolMetadata by ID + PoolMetadata(ctx context.Context, in *QueryGetPoolMetadataRequest, opts ...grpc.CallOption) (*QueryGetPoolMetadataResponse, error) + // Queries a list of PoolMetadata items. + PoolMetadataAll(ctx context.Context, in *QueryAllPoolMetadataRequest, opts ...grpc.CallOption) (*QueryAllPoolMetadataResponse, error) + // Simulates MsgDeposit + SimulateDeposit(ctx context.Context, in *QuerySimulateDepositRequest, opts ...grpc.CallOption) (*QuerySimulateDepositResponse, error) + // Simulates MsgWithdrawal + SimulateWithdrawal(ctx context.Context, in *QuerySimulateWithdrawalRequest, opts ...grpc.CallOption) (*QuerySimulateWithdrawalResponse, error) + // Simulates MsgPlaceLimitOrder + SimulatePlaceLimitOrder(ctx context.Context, in *QuerySimulatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QuerySimulatePlaceLimitOrderResponse, error) + // Simulates MsgWithdrawFilledLimitOrder + SimulateWithdrawFilledLimitOrder(ctx context.Context, in *QuerySimulateWithdrawFilledLimitOrderRequest, opts ...grpc.CallOption) (*QuerySimulateWithdrawFilledLimitOrderResponse, error) + // Simulates MsgCancelLimitOrder + SimulateCancelLimitOrder(ctx context.Context, in *QuerySimulateCancelLimitOrderRequest, opts ...grpc.CallOption) (*QuerySimulateCancelLimitOrderResponse, error) + // Simulates MsgMultiHopSwap + SimulateMultiHopSwap(ctx context.Context, in *QuerySimulateMultiHopSwapRequest, opts ...grpc.CallOption) (*QuerySimulateMultiHopSwapResponse, error) +} + +type queryClient struct { + cc grpc1.ClientConn +} + +func NewQueryClient(cc grpc1.ClientConn) QueryClient { + return &queryClient{cc} +} + +func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { + out := new(QueryParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/Params", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).LimitOrderTrancheAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/LimitOrderTrancheAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).LimitOrderTrancheAll(ctx, req.(*QueryAllLimitOrderTrancheRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_UserDepositsAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllUserDepositsRequest) - if err := dec(in); err != nil { +func (c *queryClient) LimitOrderTrancheUser(ctx context.Context, in *QueryGetLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheUserResponse, error) { + out := new(QueryGetLimitOrderTrancheUserResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUser", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).UserDepositsAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/UserDepositsAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).UserDepositsAll(ctx, req.(*QueryAllUserDepositsRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_TickLiquidityAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllTickLiquidityRequest) - if err := dec(in); err != nil { +func (c *queryClient) LimitOrderTrancheUserAll(ctx context.Context, in *QueryAllLimitOrderTrancheUserRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserResponse, error) { + out := new(QueryAllLimitOrderTrancheUserResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUserAll", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).TickLiquidityAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/TickLiquidityAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).TickLiquidityAll(ctx, req.(*QueryAllTickLiquidityRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_InactiveLimitOrderTranche_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetInactiveLimitOrderTrancheRequest) - if err := dec(in); err != nil { +func (c *queryClient) LimitOrderTrancheUserAllByAddress(ctx context.Context, in *QueryAllLimitOrderTrancheUserByAddressRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) { + out := new(QueryAllLimitOrderTrancheUserByAddressResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).InactiveLimitOrderTranche(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/InactiveLimitOrderTranche", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).InactiveLimitOrderTranche(ctx, req.(*QueryGetInactiveLimitOrderTrancheRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_InactiveLimitOrderTrancheAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllInactiveLimitOrderTrancheRequest) - if err := dec(in); err != nil { +func (c *queryClient) LimitOrderTranche(ctx context.Context, in *QueryGetLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetLimitOrderTrancheResponse, error) { + out := new(QueryGetLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTranche", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).InactiveLimitOrderTrancheAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/InactiveLimitOrderTrancheAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).InactiveLimitOrderTrancheAll(ctx, req.(*QueryAllInactiveLimitOrderTrancheRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_PoolReservesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllPoolReservesRequest) - if err := dec(in); err != nil { +func (c *queryClient) LimitOrderTrancheAll(ctx context.Context, in *QueryAllLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllLimitOrderTrancheResponse, error) { + out := new(QueryAllLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/LimitOrderTrancheAll", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).PoolReservesAll(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/PoolReservesAll", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PoolReservesAll(ctx, req.(*QueryAllPoolReservesRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_PoolReserves_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetPoolReservesRequest) - if err := dec(in); err != nil { +func (c *queryClient) UserDepositsAll(ctx context.Context, in *QueryAllUserDepositsRequest, opts ...grpc.CallOption) (*QueryAllUserDepositsResponse, error) { + out := new(QueryAllUserDepositsResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/UserDepositsAll", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).PoolReserves(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/PoolReserves", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PoolReserves(ctx, req.(*QueryGetPoolReservesRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_EstimateMultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryEstimateMultiHopSwapRequest) - if err := dec(in); err != nil { +func (c *queryClient) TickLiquidityAll(ctx context.Context, in *QueryAllTickLiquidityRequest, opts ...grpc.CallOption) (*QueryAllTickLiquidityResponse, error) { + out := new(QueryAllTickLiquidityResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/TickLiquidityAll", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).EstimateMultiHopSwap(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/EstimateMultiHopSwap", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).EstimateMultiHopSwap(ctx, req.(*QueryEstimateMultiHopSwapRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_EstimatePlaceLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryEstimatePlaceLimitOrderRequest) - if err := dec(in); err != nil { +func (c *queryClient) InactiveLimitOrderTranche(ctx context.Context, in *QueryGetInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryGetInactiveLimitOrderTrancheResponse, error) { + out := new(QueryGetInactiveLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/InactiveLimitOrderTranche", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).EstimatePlaceLimitOrder(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/EstimatePlaceLimitOrder", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).EstimatePlaceLimitOrder(ctx, req.(*QueryEstimatePlaceLimitOrderRequest)) - } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_Pool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPoolRequest) - if err := dec(in); err != nil { +func (c *queryClient) InactiveLimitOrderTrancheAll(ctx context.Context, in *QueryAllInactiveLimitOrderTrancheRequest, opts ...grpc.CallOption) (*QueryAllInactiveLimitOrderTrancheResponse, error) { + out := new(QueryAllInactiveLimitOrderTrancheResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/InactiveLimitOrderTrancheAll", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).Pool(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/Pool", + return out, nil +} + +func (c *queryClient) PoolReservesAll(ctx context.Context, in *QueryAllPoolReservesRequest, opts ...grpc.CallOption) (*QueryAllPoolReservesResponse, error) { + out := new(QueryAllPoolReservesResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolReservesAll", in, out, opts...) + if err != nil { + return nil, err } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Pool(ctx, req.(*QueryPoolRequest)) + return out, nil +} + +func (c *queryClient) PoolReserves(ctx context.Context, in *QueryGetPoolReservesRequest, opts ...grpc.CallOption) (*QueryGetPoolReservesResponse, error) { + out := new(QueryGetPoolReservesResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolReserves", in, out, opts...) + if err != nil { + return nil, err } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_PoolByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryPoolByIDRequest) - if err := dec(in); err != nil { +// Deprecated: Do not use. +func (c *queryClient) EstimateMultiHopSwap(ctx context.Context, in *QueryEstimateMultiHopSwapRequest, opts ...grpc.CallOption) (*QueryEstimateMultiHopSwapResponse, error) { + out := new(QueryEstimateMultiHopSwapResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/EstimateMultiHopSwap", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).PoolByID(ctx, in) + return out, nil +} + +// Deprecated: Do not use. +func (c *queryClient) EstimatePlaceLimitOrder(ctx context.Context, in *QueryEstimatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QueryEstimatePlaceLimitOrderResponse, error) { + out := new(QueryEstimatePlaceLimitOrderResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/EstimatePlaceLimitOrder", in, out, opts...) + if err != nil { + return nil, err } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/PoolByID", + return out, nil +} + +func (c *queryClient) Pool(ctx context.Context, in *QueryPoolRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) { + out := new(QueryPoolResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/Pool", in, out, opts...) + if err != nil { + return nil, err } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PoolByID(ctx, req.(*QueryPoolByIDRequest)) + return out, nil +} + +func (c *queryClient) PoolByID(ctx context.Context, in *QueryPoolByIDRequest, opts ...grpc.CallOption) (*QueryPoolResponse, error) { + out := new(QueryPoolResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolByID", in, out, opts...) + if err != nil { + return nil, err } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_PoolMetadata_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetPoolMetadataRequest) - if err := dec(in); err != nil { +func (c *queryClient) PoolMetadata(ctx context.Context, in *QueryGetPoolMetadataRequest, opts ...grpc.CallOption) (*QueryGetPoolMetadataResponse, error) { + out := new(QueryGetPoolMetadataResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolMetadata", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).PoolMetadata(ctx, in) + return out, nil +} + +func (c *queryClient) PoolMetadataAll(ctx context.Context, in *QueryAllPoolMetadataRequest, opts ...grpc.CallOption) (*QueryAllPoolMetadataResponse, error) { + out := new(QueryAllPoolMetadataResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/PoolMetadataAll", in, out, opts...) + if err != nil { + return nil, err } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/PoolMetadata", + return out, nil +} + +func (c *queryClient) SimulateDeposit(ctx context.Context, in *QuerySimulateDepositRequest, opts ...grpc.CallOption) (*QuerySimulateDepositResponse, error) { + out := new(QuerySimulateDepositResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/SimulateDeposit", in, out, opts...) + if err != nil { + return nil, err } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PoolMetadata(ctx, req.(*QueryGetPoolMetadataRequest)) + return out, nil +} + +func (c *queryClient) SimulateWithdrawal(ctx context.Context, in *QuerySimulateWithdrawalRequest, opts ...grpc.CallOption) (*QuerySimulateWithdrawalResponse, error) { + out := new(QuerySimulateWithdrawalResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/SimulateWithdrawal", in, out, opts...) + if err != nil { + return nil, err } - return interceptor(ctx, in, info, handler) + return out, nil } -func _Query_PoolMetadataAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryAllPoolMetadataRequest) - if err := dec(in); err != nil { +func (c *queryClient) SimulatePlaceLimitOrder(ctx context.Context, in *QuerySimulatePlaceLimitOrderRequest, opts ...grpc.CallOption) (*QuerySimulatePlaceLimitOrderResponse, error) { + out := new(QuerySimulatePlaceLimitOrderResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/SimulatePlaceLimitOrder", in, out, opts...) + if err != nil { return nil, err } - if interceptor == nil { - return srv.(QueryServer).PoolMetadataAll(ctx, in) + return out, nil +} + +func (c *queryClient) SimulateWithdrawFilledLimitOrder(ctx context.Context, in *QuerySimulateWithdrawFilledLimitOrderRequest, opts ...grpc.CallOption) (*QuerySimulateWithdrawFilledLimitOrderResponse, error) { + out := new(QuerySimulateWithdrawFilledLimitOrderResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/SimulateWithdrawFilledLimitOrder", in, out, opts...) + if err != nil { + return nil, err } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/neutron.dex.Query/PoolMetadataAll", + return out, nil +} + +func (c *queryClient) SimulateCancelLimitOrder(ctx context.Context, in *QuerySimulateCancelLimitOrderRequest, opts ...grpc.CallOption) (*QuerySimulateCancelLimitOrderResponse, error) { + out := new(QuerySimulateCancelLimitOrderResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/SimulateCancelLimitOrder", in, out, opts...) + if err != nil { + return nil, err } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).PoolMetadataAll(ctx, req.(*QueryAllPoolMetadataRequest)) + return out, nil +} + +func (c *queryClient) SimulateMultiHopSwap(ctx context.Context, in *QuerySimulateMultiHopSwapRequest, opts ...grpc.CallOption) (*QuerySimulateMultiHopSwapResponse, error) { + out := new(QuerySimulateMultiHopSwapResponse) + err := c.cc.Invoke(ctx, "/neutron.dex.Query/SimulateMultiHopSwap", in, out, opts...) + if err != nil { + return nil, err } - return interceptor(ctx, in, info, handler) + return out, nil } -var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "neutron.dex.Query", - HandlerType: (*QueryServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "Params", - Handler: _Query_Params_Handler, - }, - { - MethodName: "LimitOrderTrancheUser", - Handler: _Query_LimitOrderTrancheUser_Handler, - }, - { - MethodName: "LimitOrderTrancheUserAll", - Handler: _Query_LimitOrderTrancheUserAll_Handler, - }, - { - MethodName: "LimitOrderTrancheUserAllByAddress", - Handler: _Query_LimitOrderTrancheUserAllByAddress_Handler, - }, - { - MethodName: "LimitOrderTranche", - Handler: _Query_LimitOrderTranche_Handler, - }, - { - MethodName: "LimitOrderTrancheAll", - Handler: _Query_LimitOrderTrancheAll_Handler, - }, - { - MethodName: "UserDepositsAll", - Handler: _Query_UserDepositsAll_Handler, - }, - { - MethodName: "TickLiquidityAll", - Handler: _Query_TickLiquidityAll_Handler, - }, - { - MethodName: "InactiveLimitOrderTranche", - Handler: _Query_InactiveLimitOrderTranche_Handler, - }, - { - MethodName: "InactiveLimitOrderTrancheAll", - Handler: _Query_InactiveLimitOrderTrancheAll_Handler, - }, - { - MethodName: "PoolReservesAll", - Handler: _Query_PoolReservesAll_Handler, - }, - { - MethodName: "PoolReserves", - Handler: _Query_PoolReserves_Handler, - }, - { - MethodName: "EstimateMultiHopSwap", - Handler: _Query_EstimateMultiHopSwap_Handler, - }, - { - MethodName: "EstimatePlaceLimitOrder", - Handler: _Query_EstimatePlaceLimitOrder_Handler, - }, - { - MethodName: "Pool", - Handler: _Query_Pool_Handler, - }, - { - MethodName: "PoolByID", - Handler: _Query_PoolByID_Handler, - }, - { - MethodName: "PoolMetadata", - Handler: _Query_PoolMetadata_Handler, - }, - { - MethodName: "PoolMetadataAll", - Handler: _Query_PoolMetadataAll_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "neutron/dex/query.proto", +// QueryServer is the server API for Query service. +type QueryServer interface { + // Parameters queries the parameters of the module. + Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // Queries a LimitOrderTrancheUser by index. + LimitOrderTrancheUser(context.Context, *QueryGetLimitOrderTrancheUserRequest) (*QueryGetLimitOrderTrancheUserResponse, error) + // Queries a list of LimitOrderTranchUser items. + LimitOrderTrancheUserAll(context.Context, *QueryAllLimitOrderTrancheUserRequest) (*QueryAllLimitOrderTrancheUserResponse, error) + // Queries a list of LimitOrderTrancheUser items for a given address. + LimitOrderTrancheUserAllByAddress(context.Context, *QueryAllLimitOrderTrancheUserByAddressRequest) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) + // Queries a LimitOrderTranche by index. + LimitOrderTranche(context.Context, *QueryGetLimitOrderTrancheRequest) (*QueryGetLimitOrderTrancheResponse, error) + // Queries a list of LimitOrderTranche items for a given pairID / TokenIn + // combination. + LimitOrderTrancheAll(context.Context, *QueryAllLimitOrderTrancheRequest) (*QueryAllLimitOrderTrancheResponse, error) + // Queries a list of UserDeposits items. + UserDepositsAll(context.Context, *QueryAllUserDepositsRequest) (*QueryAllUserDepositsResponse, error) + // Queries a list of TickLiquidity items. + TickLiquidityAll(context.Context, *QueryAllTickLiquidityRequest) (*QueryAllTickLiquidityResponse, error) + // Queries a InactiveLimitOrderTranche by index. + InactiveLimitOrderTranche(context.Context, *QueryGetInactiveLimitOrderTrancheRequest) (*QueryGetInactiveLimitOrderTrancheResponse, error) + // Queries a list of InactiveLimitOrderTranche items. + InactiveLimitOrderTrancheAll(context.Context, *QueryAllInactiveLimitOrderTrancheRequest) (*QueryAllInactiveLimitOrderTrancheResponse, error) + // Queries a list of PoolReserves items. + PoolReservesAll(context.Context, *QueryAllPoolReservesRequest) (*QueryAllPoolReservesResponse, error) + // Queries a PoolReserve by index + PoolReserves(context.Context, *QueryGetPoolReservesRequest) (*QueryGetPoolReservesResponse, error) + // DEPRECATED Queries the simulated result of a multihop swap + EstimateMultiHopSwap(context.Context, *QueryEstimateMultiHopSwapRequest) (*QueryEstimateMultiHopSwapResponse, error) + // DEPRECATED Queries the simulated result of a PlaceLimit order + EstimatePlaceLimitOrder(context.Context, *QueryEstimatePlaceLimitOrderRequest) (*QueryEstimatePlaceLimitOrderResponse, error) + // Queries a pool by pair, tick and fee + Pool(context.Context, *QueryPoolRequest) (*QueryPoolResponse, error) + // Queries a pool by ID + PoolByID(context.Context, *QueryPoolByIDRequest) (*QueryPoolResponse, error) + // Queries a PoolMetadata by ID + PoolMetadata(context.Context, *QueryGetPoolMetadataRequest) (*QueryGetPoolMetadataResponse, error) + // Queries a list of PoolMetadata items. + PoolMetadataAll(context.Context, *QueryAllPoolMetadataRequest) (*QueryAllPoolMetadataResponse, error) + // Simulates MsgDeposit + SimulateDeposit(context.Context, *QuerySimulateDepositRequest) (*QuerySimulateDepositResponse, error) + // Simulates MsgWithdrawal + SimulateWithdrawal(context.Context, *QuerySimulateWithdrawalRequest) (*QuerySimulateWithdrawalResponse, error) + // Simulates MsgPlaceLimitOrder + SimulatePlaceLimitOrder(context.Context, *QuerySimulatePlaceLimitOrderRequest) (*QuerySimulatePlaceLimitOrderResponse, error) + // Simulates MsgWithdrawFilledLimitOrder + SimulateWithdrawFilledLimitOrder(context.Context, *QuerySimulateWithdrawFilledLimitOrderRequest) (*QuerySimulateWithdrawFilledLimitOrderResponse, error) + // Simulates MsgCancelLimitOrder + SimulateCancelLimitOrder(context.Context, *QuerySimulateCancelLimitOrderRequest) (*QuerySimulateCancelLimitOrderResponse, error) + // Simulates MsgMultiHopSwap + SimulateMultiHopSwap(context.Context, *QuerySimulateMultiHopSwapRequest) (*QuerySimulateMultiHopSwapResponse, error) } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil +// UnimplementedQueryServer can be embedded to have forward compatible implementations. +type UnimplementedQueryServer struct { } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") +} +func (*UnimplementedQueryServer) LimitOrderTrancheUser(ctx context.Context, req *QueryGetLimitOrderTrancheUserRequest) (*QueryGetLimitOrderTrancheUserResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheUser not implemented") +} +func (*UnimplementedQueryServer) LimitOrderTrancheUserAll(ctx context.Context, req *QueryAllLimitOrderTrancheUserRequest) (*QueryAllLimitOrderTrancheUserResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheUserAll not implemented") +} +func (*UnimplementedQueryServer) LimitOrderTrancheUserAllByAddress(ctx context.Context, req *QueryAllLimitOrderTrancheUserByAddressRequest) (*QueryAllLimitOrderTrancheUserByAddressResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheUserAllByAddress not implemented") +} +func (*UnimplementedQueryServer) LimitOrderTranche(ctx context.Context, req *QueryGetLimitOrderTrancheRequest) (*QueryGetLimitOrderTrancheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTranche not implemented") +} +func (*UnimplementedQueryServer) LimitOrderTrancheAll(ctx context.Context, req *QueryAllLimitOrderTrancheRequest) (*QueryAllLimitOrderTrancheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LimitOrderTrancheAll not implemented") +} +func (*UnimplementedQueryServer) UserDepositsAll(ctx context.Context, req *QueryAllUserDepositsRequest) (*QueryAllUserDepositsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UserDepositsAll not implemented") +} +func (*UnimplementedQueryServer) TickLiquidityAll(ctx context.Context, req *QueryAllTickLiquidityRequest) (*QueryAllTickLiquidityResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method TickLiquidityAll not implemented") +} +func (*UnimplementedQueryServer) InactiveLimitOrderTranche(ctx context.Context, req *QueryGetInactiveLimitOrderTrancheRequest) (*QueryGetInactiveLimitOrderTrancheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method InactiveLimitOrderTranche not implemented") +} +func (*UnimplementedQueryServer) InactiveLimitOrderTrancheAll(ctx context.Context, req *QueryAllInactiveLimitOrderTrancheRequest) (*QueryAllInactiveLimitOrderTrancheResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method InactiveLimitOrderTrancheAll not implemented") +} +func (*UnimplementedQueryServer) PoolReservesAll(ctx context.Context, req *QueryAllPoolReservesRequest) (*QueryAllPoolReservesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PoolReservesAll not implemented") +} +func (*UnimplementedQueryServer) PoolReserves(ctx context.Context, req *QueryGetPoolReservesRequest) (*QueryGetPoolReservesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PoolReserves not implemented") +} +func (*UnimplementedQueryServer) EstimateMultiHopSwap(ctx context.Context, req *QueryEstimateMultiHopSwapRequest) (*QueryEstimateMultiHopSwapResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EstimateMultiHopSwap not implemented") +} +func (*UnimplementedQueryServer) EstimatePlaceLimitOrder(ctx context.Context, req *QueryEstimatePlaceLimitOrderRequest) (*QueryEstimatePlaceLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EstimatePlaceLimitOrder not implemented") +} +func (*UnimplementedQueryServer) Pool(ctx context.Context, req *QueryPoolRequest) (*QueryPoolResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Pool not implemented") +} +func (*UnimplementedQueryServer) PoolByID(ctx context.Context, req *QueryPoolByIDRequest) (*QueryPoolResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PoolByID not implemented") +} +func (*UnimplementedQueryServer) PoolMetadata(ctx context.Context, req *QueryGetPoolMetadataRequest) (*QueryGetPoolMetadataResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PoolMetadata not implemented") +} +func (*UnimplementedQueryServer) PoolMetadataAll(ctx context.Context, req *QueryAllPoolMetadataRequest) (*QueryAllPoolMetadataResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PoolMetadataAll not implemented") +} +func (*UnimplementedQueryServer) SimulateDeposit(ctx context.Context, req *QuerySimulateDepositRequest) (*QuerySimulateDepositResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SimulateDeposit not implemented") +} +func (*UnimplementedQueryServer) SimulateWithdrawal(ctx context.Context, req *QuerySimulateWithdrawalRequest) (*QuerySimulateWithdrawalResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SimulateWithdrawal not implemented") +} +func (*UnimplementedQueryServer) SimulatePlaceLimitOrder(ctx context.Context, req *QuerySimulatePlaceLimitOrderRequest) (*QuerySimulatePlaceLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SimulatePlaceLimitOrder not implemented") +} +func (*UnimplementedQueryServer) SimulateWithdrawFilledLimitOrder(ctx context.Context, req *QuerySimulateWithdrawFilledLimitOrderRequest) (*QuerySimulateWithdrawFilledLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SimulateWithdrawFilledLimitOrder not implemented") +} +func (*UnimplementedQueryServer) SimulateCancelLimitOrder(ctx context.Context, req *QuerySimulateCancelLimitOrderRequest) (*QuerySimulateCancelLimitOrderResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SimulateCancelLimitOrder not implemented") +} +func (*UnimplementedQueryServer) SimulateMultiHopSwap(ctx context.Context, req *QuerySimulateMultiHopSwapRequest) (*QuerySimulateMultiHopSwapResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SimulateMultiHopSwap not implemented") } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil +func RegisterQueryServer(s grpc1.Server, srv QueryServer) { + s.RegisterService(&_Query_serviceDesc, srv) } -func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryParamsRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil -} - -func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) + if interceptor == nil { + return srv.(QueryServer).Params(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/Params", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) +func _Query_LimitOrderTrancheUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetLimitOrderTrancheUserRequest) + if err := dec(in); err != nil { + return nil, err } - i-- - dAtA[i] = 0xa - return len(dAtA) - i, nil + if interceptor == nil { + return srv.(QueryServer).LimitOrderTrancheUser(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/LimitOrderTrancheUser", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTrancheUser(ctx, req.(*QueryGetLimitOrderTrancheUserRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheUserRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_LimitOrderTrancheUserAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllLimitOrderTrancheUserRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil + if interceptor == nil { + return srv.(QueryServer).LimitOrderTrancheUserAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/LimitOrderTrancheUserAll", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTrancheUserAll(ctx, req.(*QueryAllLimitOrderTrancheUserRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheUserRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func _Query_LimitOrderTrancheUserAllByAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllLimitOrderTrancheUserByAddressRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/LimitOrderTrancheUserAllByAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTrancheUserAllByAddress(ctx, req.(*QueryAllLimitOrderTrancheUserByAddressRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheUserRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.CalcWithdrawableShares { - i-- - if m.CalcWithdrawableShares { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 +func _Query_LimitOrderTranche_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetLimitOrderTrancheRequest) + if err := dec(in); err != nil { + return nil, err } - if len(m.TrancheKey) > 0 { - i -= len(m.TrancheKey) - copy(dAtA[i:], m.TrancheKey) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TrancheKey))) - i-- - dAtA[i] = 0x12 + if interceptor == nil { + return srv.(QueryServer).LimitOrderTranche(ctx, in) } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/LimitOrderTranche", } - return len(dAtA) - i, nil + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTranche(ctx, req.(*QueryGetLimitOrderTrancheRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheUserResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_LimitOrderTrancheAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllLimitOrderTrancheRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil -} - -func (m *QueryGetLimitOrderTrancheUserResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryGetLimitOrderTrancheUserResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.WithdrawableShares != nil { - { - size := m.WithdrawableShares.Size() - i -= size - if _, err := m.WithdrawableShares.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + if interceptor == nil { + return srv.(QueryServer).LimitOrderTrancheAll(ctx, in) } - if m.LimitOrderTrancheUser != nil { - { - size, err := m.LimitOrderTrancheUser.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/LimitOrderTrancheAll", } - return len(dAtA) - i, nil + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).LimitOrderTrancheAll(ctx, req.(*QueryAllLimitOrderTrancheRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheUserRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_UserDepositsAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllUserDepositsRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil -} - -func (m *QueryAllLimitOrderTrancheUserRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryAllLimitOrderTrancheUserRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa + if interceptor == nil { + return srv.(QueryServer).UserDepositsAll(ctx, in) } - return len(dAtA) - i, nil + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/UserDepositsAll", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).UserDepositsAll(ctx, req.(*QueryAllUserDepositsRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheUserResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_TickLiquidityAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllTickLiquidityRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil -} - -func (m *QueryAllLimitOrderTrancheUserResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *QueryAllLimitOrderTrancheUserResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + if interceptor == nil { + return srv.(QueryServer).TickLiquidityAll(ctx, in) } - if len(m.LimitOrderTrancheUser) > 0 { - for iNdEx := len(m.LimitOrderTrancheUser) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.LimitOrderTrancheUser[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/TickLiquidityAll", } - return len(dAtA) - i, nil + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).TickLiquidityAll(ctx, req.(*QueryAllTickLiquidityRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_InactiveLimitOrderTranche_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetInactiveLimitOrderTrancheRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil -} - -func (m *QueryGetLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) + if interceptor == nil { + return srv.(QueryServer).InactiveLimitOrderTranche(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/InactiveLimitOrderTranche", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).InactiveLimitOrderTranche(ctx, req.(*QueryGetInactiveLimitOrderTrancheRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.TrancheKey) > 0 { - i -= len(m.TrancheKey) - copy(dAtA[i:], m.TrancheKey) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TrancheKey))) - i-- - dAtA[i] = 0x22 +func _Query_InactiveLimitOrderTrancheAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllInactiveLimitOrderTrancheRequest) + if err := dec(in); err != nil { + return nil, err } - if len(m.TokenIn) > 0 { - i -= len(m.TokenIn) - copy(dAtA[i:], m.TokenIn) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) - i-- - dAtA[i] = 0x1a + if interceptor == nil { + return srv.(QueryServer).InactiveLimitOrderTrancheAll(ctx, in) } - if m.TickIndex != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) - i-- - dAtA[i] = 0x10 + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/InactiveLimitOrderTrancheAll", } - if len(m.PairId) > 0 { - i -= len(m.PairId) - copy(dAtA[i:], m.PairId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) - i-- - dAtA[i] = 0xa + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).InactiveLimitOrderTrancheAll(ctx, req.(*QueryAllInactiveLimitOrderTrancheRequest)) } - return len(dAtA) - i, nil + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_PoolReservesAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllPoolReservesRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil -} - -func (m *QueryGetLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) + if interceptor == nil { + return srv.(QueryServer).PoolReservesAll(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/PoolReservesAll", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PoolReservesAll(ctx, req.(*QueryAllPoolReservesRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryGetLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.LimitOrderTranche != nil { - { - size, err := m.LimitOrderTranche.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa +func _Query_PoolReserves_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetPoolReservesRequest) + if err := dec(in); err != nil { + return nil, err } - return len(dAtA) - i, nil + if interceptor == nil { + return srv.(QueryServer).PoolReserves(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/PoolReserves", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PoolReserves(ctx, req.(*QueryGetPoolReservesRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_EstimateMultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryEstimateMultiHopSwapRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil + if interceptor == nil { + return srv.(QueryServer).EstimateMultiHopSwap(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/EstimateMultiHopSwap", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).EstimateMultiHopSwap(ctx, req.(*QueryEstimateMultiHopSwapRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func _Query_EstimatePlaceLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryEstimatePlaceLimitOrderRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).EstimatePlaceLimitOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/EstimatePlaceLimitOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).EstimatePlaceLimitOrder(ctx, req.(*QueryEstimatePlaceLimitOrderRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a +func _Query_Pool_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryPoolRequest) + if err := dec(in); err != nil { + return nil, err } - if len(m.TokenIn) > 0 { - i -= len(m.TokenIn) - copy(dAtA[i:], m.TokenIn) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) - i-- - dAtA[i] = 0x12 + if interceptor == nil { + return srv.(QueryServer).Pool(ctx, in) } - if len(m.PairId) > 0 { - i -= len(m.PairId) - copy(dAtA[i:], m.PairId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) - i-- - dAtA[i] = 0xa + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/Pool", } - return len(dAtA) - i, nil + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).Pool(ctx, req.(*QueryPoolRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_PoolByID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryPoolByIDRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil + if interceptor == nil { + return srv.(QueryServer).PoolByID(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/PoolByID", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PoolByID(ctx, req.(*QueryPoolByIDRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func _Query_PoolMetadata_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryGetPoolMetadataRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).PoolMetadata(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/PoolMetadata", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PoolMetadata(ctx, req.(*QueryGetPoolMetadataRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 +func _Query_PoolMetadataAll_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllPoolMetadataRequest) + if err := dec(in); err != nil { + return nil, err } - if len(m.LimitOrderTranche) > 0 { - for iNdEx := len(m.LimitOrderTranche) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.LimitOrderTranche[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } + if interceptor == nil { + return srv.(QueryServer).PoolMetadataAll(ctx, in) } - return len(dAtA) - i, nil + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/PoolMetadataAll", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).PoolMetadataAll(ctx, req.(*QueryAllPoolMetadataRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllUserDepositsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { +func _Query_SimulateDeposit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySimulateDepositRequest) + if err := dec(in); err != nil { return nil, err } - return dAtA[:n], nil + if interceptor == nil { + return srv.(QueryServer).SimulateDeposit(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/SimulateDeposit", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).SimulateDeposit(ctx, req.(*QuerySimulateDepositRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllUserDepositsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) +func _Query_SimulateWithdrawal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySimulateWithdrawalRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).SimulateWithdrawal(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/SimulateWithdrawal", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).SimulateWithdrawal(ctx, req.(*QuerySimulateWithdrawalRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllUserDepositsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.IncludePoolData { - i-- - if m.IncludePoolData { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x18 +func _Query_SimulatePlaceLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySimulatePlaceLimitOrderRequest) + if err := dec(in); err != nil { + return nil, err } - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + if interceptor == nil { + return srv.(QueryServer).SimulatePlaceLimitOrder(ctx, in) } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) - i-- - dAtA[i] = 0xa + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/SimulatePlaceLimitOrder", } - return len(dAtA) - i, nil + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).SimulatePlaceLimitOrder(ctx, req.(*QuerySimulatePlaceLimitOrderRequest)) + } + return interceptor(ctx, in, info, handler) } -func (m *QueryAllUserDepositsResponse) Marshal() (dAtA []byte, err error) { +func _Query_SimulateWithdrawFilledLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySimulateWithdrawFilledLimitOrderRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).SimulateWithdrawFilledLimitOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/SimulateWithdrawFilledLimitOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).SimulateWithdrawFilledLimitOrder(ctx, req.(*QuerySimulateWithdrawFilledLimitOrderRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_SimulateCancelLimitOrder_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySimulateCancelLimitOrderRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).SimulateCancelLimitOrder(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/SimulateCancelLimitOrder", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).SimulateCancelLimitOrder(ctx, req.(*QuerySimulateCancelLimitOrderRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_SimulateMultiHopSwap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySimulateMultiHopSwapRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).SimulateMultiHopSwap(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.dex.Query/SimulateMultiHopSwap", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).SimulateMultiHopSwap(ctx, req.(*QuerySimulateMultiHopSwapRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Query_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neutron.dex.Query", + HandlerType: (*QueryServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Params", + Handler: _Query_Params_Handler, + }, + { + MethodName: "LimitOrderTrancheUser", + Handler: _Query_LimitOrderTrancheUser_Handler, + }, + { + MethodName: "LimitOrderTrancheUserAll", + Handler: _Query_LimitOrderTrancheUserAll_Handler, + }, + { + MethodName: "LimitOrderTrancheUserAllByAddress", + Handler: _Query_LimitOrderTrancheUserAllByAddress_Handler, + }, + { + MethodName: "LimitOrderTranche", + Handler: _Query_LimitOrderTranche_Handler, + }, + { + MethodName: "LimitOrderTrancheAll", + Handler: _Query_LimitOrderTrancheAll_Handler, + }, + { + MethodName: "UserDepositsAll", + Handler: _Query_UserDepositsAll_Handler, + }, + { + MethodName: "TickLiquidityAll", + Handler: _Query_TickLiquidityAll_Handler, + }, + { + MethodName: "InactiveLimitOrderTranche", + Handler: _Query_InactiveLimitOrderTranche_Handler, + }, + { + MethodName: "InactiveLimitOrderTrancheAll", + Handler: _Query_InactiveLimitOrderTrancheAll_Handler, + }, + { + MethodName: "PoolReservesAll", + Handler: _Query_PoolReservesAll_Handler, + }, + { + MethodName: "PoolReserves", + Handler: _Query_PoolReserves_Handler, + }, + { + MethodName: "EstimateMultiHopSwap", + Handler: _Query_EstimateMultiHopSwap_Handler, + }, + { + MethodName: "EstimatePlaceLimitOrder", + Handler: _Query_EstimatePlaceLimitOrder_Handler, + }, + { + MethodName: "Pool", + Handler: _Query_Pool_Handler, + }, + { + MethodName: "PoolByID", + Handler: _Query_PoolByID_Handler, + }, + { + MethodName: "PoolMetadata", + Handler: _Query_PoolMetadata_Handler, + }, + { + MethodName: "PoolMetadataAll", + Handler: _Query_PoolMetadataAll_Handler, + }, + { + MethodName: "SimulateDeposit", + Handler: _Query_SimulateDeposit_Handler, + }, + { + MethodName: "SimulateWithdrawal", + Handler: _Query_SimulateWithdrawal_Handler, + }, + { + MethodName: "SimulatePlaceLimitOrder", + Handler: _Query_SimulatePlaceLimitOrder_Handler, + }, + { + MethodName: "SimulateWithdrawFilledLimitOrder", + Handler: _Query_SimulateWithdrawFilledLimitOrder_Handler, + }, + { + MethodName: "SimulateCancelLimitOrder", + Handler: _Query_SimulateCancelLimitOrder_Handler, + }, + { + MethodName: "SimulateMultiHopSwap", + Handler: _Query_SimulateMultiHopSwap_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/dex/query.proto", +} + +func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3307,46 +3645,53 @@ func (m *QueryAllUserDepositsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllUserDepositsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllUserDepositsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + return len(dAtA) - i, nil +} + +func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - if len(m.Deposits) > 0 { - for iNdEx := len(m.Deposits) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Deposits[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa + return dAtA[:n], nil +} + +func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetLimitOrderTrancheUserRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3356,26 +3701,31 @@ func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Marshal() (dAtA []byte, return dAtA[:n], nil } -func (m *QueryAllLimitOrderTrancheUserByAddressRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheUserRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllLimitOrderTrancheUserByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheUserRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + if m.CalcWithdrawableShares { + i-- + if m.CalcWithdrawableShares { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } i-- + dAtA[i] = 0x18 + } + if len(m.TrancheKey) > 0 { + i -= len(m.TrancheKey) + copy(dAtA[i:], m.TrancheKey) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TrancheKey))) + i-- dAtA[i] = 0x12 } if len(m.Address) > 0 { @@ -3388,7 +3738,7 @@ func (m *QueryAllLimitOrderTrancheUserByAddressRequest) MarshalToSizedBuffer(dAt return len(dAtA) - i, nil } -func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetLimitOrderTrancheUserResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3398,46 +3748,44 @@ func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Marshal() (dAtA []byte, return dAtA[:n], nil } -func (m *QueryAllLimitOrderTrancheUserByAddressResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheUserResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllLimitOrderTrancheUserByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheUserResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { + if m.WithdrawableShares != nil { { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { + size := m.WithdrawableShares.Size() + i -= size + if _, err := m.WithdrawableShares.MarshalTo(dAtA[i:]); err != nil { return 0, err } - i -= size i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- dAtA[i] = 0x12 } - if len(m.LimitOrders) > 0 { - for iNdEx := len(m.LimitOrders) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.LimitOrders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + if m.LimitOrderTrancheUser != nil { + { + size, err := m.LimitOrderTrancheUser.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0xa + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllTickLiquidityRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLimitOrderTrancheUserRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3447,12 +3795,12 @@ func (m *QueryAllTickLiquidityRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllTickLiquidityRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllTickLiquidityRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3467,26 +3815,12 @@ func (m *QueryAllTickLiquidityRequest) MarshalToSizedBuffer(dAtA []byte) (int, e i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a - } - if len(m.TokenIn) > 0 { - i -= len(m.TokenIn) - copy(dAtA[i:], m.TokenIn) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) - i-- - dAtA[i] = 0x12 - } - if len(m.PairId) > 0 { - i -= len(m.PairId) - copy(dAtA[i:], m.PairId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllTickLiquidityResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLimitOrderTrancheUserResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3496,12 +3830,12 @@ func (m *QueryAllTickLiquidityResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllTickLiquidityResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllTickLiquidityResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3518,10 +3852,10 @@ func (m *QueryAllTickLiquidityResponse) MarshalToSizedBuffer(dAtA []byte) (int, i-- dAtA[i] = 0x12 } - if len(m.TickLiquidity) > 0 { - for iNdEx := len(m.TickLiquidity) - 1; iNdEx >= 0; iNdEx-- { + if len(m.LimitOrderTrancheUser) > 0 { + for iNdEx := len(m.LimitOrderTrancheUser) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.TickLiquidity[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.LimitOrderTrancheUser[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3535,7 +3869,7 @@ func (m *QueryAllTickLiquidityResponse) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *QueryGetInactiveLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3545,12 +3879,12 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Marshal() (dAtA []byte, err e return dAtA[:n], nil } -func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3562,17 +3896,17 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []b i-- dAtA[i] = 0x22 } - if m.TickIndex != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) - i-- - dAtA[i] = 0x18 - } if len(m.TokenIn) > 0 { i -= len(m.TokenIn) copy(dAtA[i:], m.TokenIn) i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a + } + if m.TickIndex != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) + i-- + dAtA[i] = 0x10 } if len(m.PairId) > 0 { i -= len(m.PairId) @@ -3584,7 +3918,7 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []b return len(dAtA) - i, nil } -func (m *QueryGetInactiveLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3594,19 +3928,19 @@ func (m *QueryGetInactiveLimitOrderTrancheResponse) Marshal() (dAtA []byte, err return dAtA[:n], nil } -func (m *QueryGetInactiveLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.InactiveLimitOrderTranche != nil { + if m.LimitOrderTranche != nil { { - size, err := m.InactiveLimitOrderTranche.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.LimitOrderTranche.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3619,7 +3953,7 @@ func (m *QueryGetInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA [] return len(dAtA) - i, nil } -func (m *QueryAllInactiveLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3629,12 +3963,12 @@ func (m *QueryAllInactiveLimitOrderTrancheRequest) Marshal() (dAtA []byte, err e return dAtA[:n], nil } -func (m *QueryAllInactiveLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3649,12 +3983,26 @@ func (m *QueryAllInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []b i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x1a + } + if len(m.TokenIn) > 0 { + i -= len(m.TokenIn) + copy(dAtA[i:], m.TokenIn) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) + i-- + dAtA[i] = 0x12 + } + if len(m.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllInactiveLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3664,12 +4012,12 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) Marshal() (dAtA []byte, err return dAtA[:n], nil } -func (m *QueryAllInactiveLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3686,10 +4034,10 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA [] i-- dAtA[i] = 0x12 } - if len(m.InactiveLimitOrderTranche) > 0 { - for iNdEx := len(m.InactiveLimitOrderTranche) - 1; iNdEx >= 0; iNdEx-- { + if len(m.LimitOrderTranche) > 0 { + for iNdEx := len(m.LimitOrderTranche) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.InactiveLimitOrderTranche[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.LimitOrderTranche[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3703,7 +4051,7 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA [] return len(dAtA) - i, nil } -func (m *QueryAllPoolReservesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllUserDepositsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3713,16 +4061,26 @@ func (m *QueryAllPoolReservesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPoolReservesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllUserDepositsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllUserDepositsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l + if m.IncludePoolData { + i-- + if m.IncludePoolData { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x18 + } if m.Pagination != nil { { size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) @@ -3733,26 +4091,19 @@ func (m *QueryAllPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, er i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a - } - if len(m.TokenIn) > 0 { - i -= len(m.TokenIn) - copy(dAtA[i:], m.TokenIn) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) - i-- dAtA[i] = 0x12 } - if len(m.PairId) > 0 { - i -= len(m.PairId) - copy(dAtA[i:], m.PairId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryAllPoolReservesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllUserDepositsResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3762,12 +4113,12 @@ func (m *QueryAllPoolReservesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPoolReservesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllUserDepositsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllUserDepositsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -3784,10 +4135,10 @@ func (m *QueryAllPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, e i-- dAtA[i] = 0x12 } - if len(m.PoolReserves) > 0 { - for iNdEx := len(m.PoolReserves) - 1; iNdEx >= 0; iNdEx-- { + if len(m.Deposits) > 0 { + for iNdEx := len(m.Deposits) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.PoolReserves[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Deposits[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3801,7 +4152,7 @@ func (m *QueryAllPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } -func (m *QueryGetPoolReservesRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3811,44 +4162,39 @@ func (m *QueryGetPoolReservesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetPoolReservesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserByAddressRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Fee != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Fee)) - i-- - dAtA[i] = 0x20 - } - if m.TickIndex != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) - i-- - dAtA[i] = 0x18 - } - if len(m.TokenIn) > 0 { - i -= len(m.TokenIn) - copy(dAtA[i:], m.TokenIn) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0x12 } - if len(m.PairId) > 0 { - i -= len(m.PairId) - copy(dAtA[i:], m.PairId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryGetPoolReservesResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3858,19 +4204,19 @@ func (m *QueryGetPoolReservesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetPoolReservesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserByAddressResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllLimitOrderTrancheUserByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.PoolReserves != nil { + if m.Pagination != nil { { - size, err := m.PoolReserves.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3878,12 +4224,26 @@ func (m *QueryGetPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, e i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + if len(m.LimitOrders) > 0 { + for iNdEx := len(m.LimitOrders) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.LimitOrders[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } return len(dAtA) - i, nil } -func (m *QueryEstimateMultiHopSwapRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllTickLiquidityRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3893,78 +4253,46 @@ func (m *QueryEstimateMultiHopSwapRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryEstimateMultiHopSwapRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllTickLiquidityRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryEstimateMultiHopSwapRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllTickLiquidityRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.PickBestRoute { - i-- - if m.PickBestRoute { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x30 - } - { - size := m.ExitLimitPrice.Size() - i -= size - if _, err := m.ExitLimitPrice.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) + dAtA[i] = 0x1a } - i-- - dAtA[i] = 0x2a - { - size := m.AmountIn.Size() - i -= size - if _, err := m.AmountIn.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - if len(m.Routes) > 0 { - for iNdEx := len(m.Routes) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Routes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - } - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Receiver))) + if len(m.TokenIn) > 0 { + i -= len(m.TokenIn) + copy(dAtA[i:], m.TokenIn) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) i-- dAtA[i] = 0x12 } - if len(m.Creator) > 0 { - i -= len(m.Creator) - copy(dAtA[i:], m.Creator) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Creator))) + if len(m.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryEstimateMultiHopSwapResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryAllTickLiquidityResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3974,30 +4302,46 @@ func (m *QueryEstimateMultiHopSwapResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryEstimateMultiHopSwapResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllTickLiquidityResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryEstimateMultiHopSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllTickLiquidityResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - { - size := m.CoinOut.Size() - i -= size - if _, err := m.CoinOut.MarshalTo(dAtA[i:]); err != nil { - return 0, err + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.TickLiquidity) > 0 { + for iNdEx := len(m.TickLiquidity) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.TickLiquidity[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - i = encodeVarintQuery(dAtA, i, uint64(size)) } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *QueryEstimatePlaceLimitOrderRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetInactiveLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4007,90 +4351,46 @@ func (m *QueryEstimatePlaceLimitOrderRequest) Marshal() (dAtA []byte, err error) return dAtA[:n], nil } -func (m *QueryEstimatePlaceLimitOrderRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryEstimatePlaceLimitOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.MaxAmountOut != nil { - { - size := m.MaxAmountOut.Size() - i -= size - if _, err := m.MaxAmountOut.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x4a - } - if m.ExpirationTime != nil { - n21, err21 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ExpirationTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime):]) - if err21 != nil { - return 0, err21 - } - i -= n21 - i = encodeVarintQuery(dAtA, i, uint64(n21)) - i-- - dAtA[i] = 0x42 - } - if m.OrderType != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.OrderType)) - i-- - dAtA[i] = 0x38 - } - { - size := m.AmountIn.Size() - i -= size - if _, err := m.AmountIn.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - if m.TickIndexInToOut != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TickIndexInToOut)) + if len(m.TrancheKey) > 0 { + i -= len(m.TrancheKey) + copy(dAtA[i:], m.TrancheKey) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TrancheKey))) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x22 } - if len(m.TokenOut) > 0 { - i -= len(m.TokenOut) - copy(dAtA[i:], m.TokenOut) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenOut))) + if m.TickIndex != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x18 } if len(m.TokenIn) > 0 { i -= len(m.TokenIn) copy(dAtA[i:], m.TokenIn) i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) i-- - dAtA[i] = 0x1a - } - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Receiver))) - i-- dAtA[i] = 0x12 } - if len(m.Creator) > 0 { - i -= len(m.Creator) - copy(dAtA[i:], m.Creator) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Creator))) + if len(m.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryEstimatePlaceLimitOrderResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetInactiveLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4100,50 +4400,32 @@ func (m *QueryEstimatePlaceLimitOrderResponse) Marshal() (dAtA []byte, err error return dAtA[:n], nil } -func (m *QueryEstimatePlaceLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetInactiveLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryEstimatePlaceLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - { - size := m.SwapOutCoin.Size() - i -= size - if _, err := m.SwapOutCoin.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - { - size := m.SwapInCoin.Size() - i -= size - if _, err := m.SwapInCoin.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - { - size := m.TotalInCoin.Size() - i -= size - if _, err := m.TotalInCoin.MarshalTo(dAtA[i:]); err != nil { - return 0, err + if m.InactiveLimitOrderTranche != nil { + { + size, err := m.InactiveLimitOrderTranche.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } - i = encodeVarintQuery(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *QueryPoolRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllInactiveLimitOrderTrancheRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4153,37 +4435,32 @@ func (m *QueryPoolRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPoolRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllInactiveLimitOrderTrancheRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPoolRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllInactiveLimitOrderTrancheRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Fee != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Fee)) - i-- - dAtA[i] = 0x18 - } - if m.TickIndex != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) - i-- - dAtA[i] = 0x10 - } - if len(m.PairId) > 0 { - i -= len(m.PairId) - copy(dAtA[i:], m.PairId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryPoolByIDRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllInactiveLimitOrderTrancheResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4193,47 +4470,68 @@ func (m *QueryPoolByIDRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryPoolByIDRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllInactiveLimitOrderTrancheResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPoolByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllInactiveLimitOrderTrancheResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.PoolId != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.PoolId)) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *QueryPoolResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err + dAtA[i] = 0x12 + } + if len(m.InactiveLimitOrderTranche) > 0 { + for iNdEx := len(m.InactiveLimitOrderTranche) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.InactiveLimitOrderTranche[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *QueryAllPoolReservesRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } return dAtA[:n], nil } -func (m *QueryPoolResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPoolReservesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryPoolResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pool != nil { + if m.Pagination != nil { { - size, err := m.Pool.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4241,12 +4539,26 @@ func (m *QueryPoolResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x1a + } + if len(m.TokenIn) > 0 { + i -= len(m.TokenIn) + copy(dAtA[i:], m.TokenIn) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) + i-- + dAtA[i] = 0x12 + } + if len(m.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QueryGetPoolMetadataRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryAllPoolReservesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4256,25 +4568,46 @@ func (m *QueryGetPoolMetadataRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetPoolMetadataRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryAllPoolReservesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetPoolMetadataRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryAllPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Id != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x8 + dAtA[i] = 0x12 + } + if len(m.PoolReserves) > 0 { + for iNdEx := len(m.PoolReserves) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PoolReserves[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } return len(dAtA) - i, nil } -func (m *QueryGetPoolMetadataResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryGetPoolReservesRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4284,30 +4617,44 @@ func (m *QueryGetPoolMetadataResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetPoolMetadataResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetPoolReservesRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetPoolMetadataResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetPoolReservesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - { - size, err := m.PoolMetadata.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + if m.Fee != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Fee)) + i-- + dAtA[i] = 0x20 + } + if m.TickIndex != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) + i-- + dAtA[i] = 0x18 + } + if len(m.TokenIn) > 0 { + i -= len(m.TokenIn) + copy(dAtA[i:], m.TokenIn) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) + i-- + dAtA[i] = 0x12 + } + if len(m.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } -func (m *QueryAllPoolMetadataRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryGetPoolReservesResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4317,19 +4664,19 @@ func (m *QueryAllPoolMetadataRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPoolMetadataRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryGetPoolReservesResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPoolMetadataRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryGetPoolReservesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { + if m.PoolReserves != nil { { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.PoolReserves.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4342,7 +4689,7 @@ func (m *QueryAllPoolMetadataRequest) MarshalToSizedBuffer(dAtA []byte) (int, er return len(dAtA) - i, nil } -func (m *QueryAllPoolMetadataResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryEstimateMultiHopSwapRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -4352,32 +4699,50 @@ func (m *QueryAllPoolMetadataResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryAllPoolMetadataResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryEstimateMultiHopSwapRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllPoolMetadataResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryEstimateMultiHopSwapRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Pagination != nil { - { - size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) + if m.PickBestRoute { + i-- + if m.PickBestRoute { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x30 } - if len(m.PoolMetadata) > 0 { - for iNdEx := len(m.PoolMetadata) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.ExitLimitPrice.Size() + i -= size + if _, err := m.ExitLimitPrice.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a + { + size := m.AmountIn.Size() + i -= size + if _, err := m.AmountIn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + if len(m.Routes) > 0 { + for iNdEx := len(m.Routes) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.PoolMetadata[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Routes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -4385,652 +4750,2785 @@ func (m *QueryAllPoolMetadataResponse) MarshalToSizedBuffer(dAtA []byte) (int, e i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x1a } } + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Receiver))) + i-- + dAtA[i] = 0x12 + } + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *QueryParamsRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QueryEstimateMultiHopSwapResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - var l int - _ = l - return n + return dAtA[:n], nil } -func (m *QueryParamsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = m.Params.Size() - n += 1 + l + sovQuery(uint64(l)) - return n +func (m *QueryEstimateMultiHopSwapResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetLimitOrderTrancheUserRequest) Size() (n int) { - if m == nil { - return 0 - } +func (m *QueryEstimateMultiHopSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TrancheKey) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.CalcWithdrawableShares { - n += 2 + { + size := m.CoinOut.Size() + i -= size + if _, err := m.CoinOut.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) } - return n + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } -func (m *QueryGetLimitOrderTrancheUserResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.LimitOrderTrancheUser != nil { - l = m.LimitOrderTrancheUser.Size() - n += 1 + l + sovQuery(uint64(l)) - } - if m.WithdrawableShares != nil { - l = m.WithdrawableShares.Size() - n += 1 + l + sovQuery(uint64(l)) +func (m *QueryEstimatePlaceLimitOrderRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - return n + return dAtA[:n], nil } -func (m *QueryAllLimitOrderTrancheUserRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n +func (m *QueryEstimatePlaceLimitOrderRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllLimitOrderTrancheUserResponse) Size() (n int) { - if m == nil { - return 0 - } +func (m *QueryEstimatePlaceLimitOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.LimitOrderTrancheUser) > 0 { - for _, e := range m.LimitOrderTrancheUser { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.MaxAmountOut != nil { + { + size := m.MaxAmountOut.Size() + i -= size + if _, err := m.MaxAmountOut.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x4a } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.ExpirationTime != nil { + n21, err21 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(*m.ExpirationTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime):]) + if err21 != nil { + return 0, err21 + } + i -= n21 + i = encodeVarintQuery(dAtA, i, uint64(n21)) + i-- + dAtA[i] = 0x42 } - return n -} - -func (m *QueryGetLimitOrderTrancheRequest) Size() (n int) { - if m == nil { - return 0 + if m.OrderType != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.OrderType)) + i-- + dAtA[i] = 0x38 } - var l int - _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + { + size := m.AmountIn.Size() + i -= size + if _, err := m.AmountIn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) } - if m.TickIndex != 0 { - n += 1 + sovQuery(uint64(m.TickIndex)) + i-- + dAtA[i] = 0x32 + if m.TickIndexInToOut != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TickIndexInToOut)) + i-- + dAtA[i] = 0x28 } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if len(m.TokenOut) > 0 { + i -= len(m.TokenOut) + copy(dAtA[i:], m.TokenOut) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenOut))) + i-- + dAtA[i] = 0x22 } - l = len(m.TrancheKey) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if len(m.TokenIn) > 0 { + i -= len(m.TokenIn) + copy(dAtA[i:], m.TokenIn) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TokenIn))) + i-- + dAtA[i] = 0x1a } - return n -} - -func (m *QueryGetLimitOrderTrancheResponse) Size() (n int) { - if m == nil { - return 0 + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Receiver))) + i-- + dAtA[i] = 0x12 } - var l int - _ = l - if m.LimitOrderTranche != nil { - l = m.LimitOrderTranche.Size() - n += 1 + l + sovQuery(uint64(l)) + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryAllLimitOrderTrancheRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) +func (m *QueryEstimatePlaceLimitOrderResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - return n + return dAtA[:n], nil } -func (m *QueryAllLimitOrderTrancheResponse) Size() (n int) { - if m == nil { - return 0 - } +func (m *QueryEstimatePlaceLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryEstimatePlaceLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.LimitOrderTranche) > 0 { - for _, e := range m.LimitOrderTranche { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + { + size := m.SwapOutCoin.Size() + i -= size + if _, err := m.SwapOutCoin.MarshalTo(dAtA[i:]); err != nil { + return 0, err } + i = encodeVarintQuery(dAtA, i, uint64(size)) } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + i-- + dAtA[i] = 0x1a + { + size := m.SwapInCoin.Size() + i -= size + if _, err := m.SwapInCoin.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) } - return n + i-- + dAtA[i] = 0x12 + { + size := m.TotalInCoin.Size() + i -= size + if _, err := m.TotalInCoin.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } -func (m *QueryAllUserDepositsRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QueryPoolRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QueryPoolRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryPoolRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if m.Fee != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Fee)) + i-- + dAtA[i] = 0x18 } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.TickIndex != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.TickIndex)) + i-- + dAtA[i] = 0x10 } - if m.IncludePoolData { - n += 2 + if len(m.PairId) > 0 { + i -= len(m.PairId) + copy(dAtA[i:], m.PairId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PairId))) + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryAllUserDepositsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.Deposits) > 0 { - for _, e := range m.Deposits { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) +func (m *QueryPoolByIDRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - return n + return dAtA[:n], nil } -func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Size() (n int) { - if m == nil { - return 0 - } +func (m *QueryPoolByIDRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryPoolByIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.Address) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.PoolId != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.PoolId)) + i-- + dAtA[i] = 0x8 } - return n + return len(dAtA) - i, nil } -func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QueryPoolResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QueryPoolResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryPoolResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.LimitOrders) > 0 { - for _, e := range m.LimitOrders { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Pool != nil { + { + size, err := m.Pool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n + return len(dAtA) - i, nil } -func (m *QueryAllTickLiquidityRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QueryGetPoolMetadataRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QueryGetPoolMetadataRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetPoolMetadataRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Id != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Id)) + i-- + dAtA[i] = 0x8 } - return n + return len(dAtA) - i, nil } -func (m *QueryAllTickLiquidityResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QueryGetPoolMetadataResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QueryGetPoolMetadataResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryGetPoolMetadataResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.TickLiquidity) > 0 { - for _, e := range m.TickLiquidity { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + { + size, err := m.PoolMetadata.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } -func (m *QueryGetInactiveLimitOrderTrancheRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.TickIndex != 0 { - n += 1 + sovQuery(uint64(m.TickIndex)) - } - l = len(m.TrancheKey) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) +func (m *QueryAllPoolMetadataRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - return n + return dAtA[:n], nil } -func (m *QueryGetInactiveLimitOrderTrancheResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.InactiveLimitOrderTranche != nil { - l = m.InactiveLimitOrderTranche.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n +func (m *QueryAllPoolMetadataRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryAllInactiveLimitOrderTrancheRequest) Size() (n int) { - if m == nil { - return 0 - } +func (m *QueryAllPoolMetadataRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryAllInactiveLimitOrderTrancheResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QueryAllPoolMetadataResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QueryAllPoolMetadataResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllPoolMetadataResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.InactiveLimitOrderTranche) > 0 { - for _, e := range m.InactiveLimitOrderTranche { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } - } if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.PoolMetadata) > 0 { + for iNdEx := len(m.PoolMetadata) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PoolMetadata[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil } -func (m *QueryAllPoolReservesRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateDepositRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateDepositRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateDepositRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Msg != nil { + { + size, err := m.Msg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryAllPoolReservesResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateDepositResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateDepositResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateDepositResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.PoolReserves) > 0 { - for _, e := range m.PoolReserves { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Resp != nil { + { + size, err := m.Resp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n + return len(dAtA) - i, nil } -func (m *QueryGetPoolReservesRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateWithdrawalRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateWithdrawalRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateWithdrawalRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.TickIndex != 0 { - n += 1 + sovQuery(uint64(m.TickIndex)) - } - if m.Fee != 0 { - n += 1 + sovQuery(uint64(m.Fee)) + if m.Msg != nil { + { + size, err := m.Msg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryGetPoolReservesResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateWithdrawalResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateWithdrawalResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateWithdrawalResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if m.PoolReserves != nil { - l = m.PoolReserves.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Resp != nil { + { + size, err := m.Resp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryEstimateMultiHopSwapRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulatePlaceLimitOrderRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulatePlaceLimitOrderRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulatePlaceLimitOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if len(m.Routes) > 0 { - for _, e := range m.Routes { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Msg != nil { + { + size, err := m.Msg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - l = m.AmountIn.Size() - n += 1 + l + sovQuery(uint64(l)) - l = m.ExitLimitPrice.Size() - n += 1 + l + sovQuery(uint64(l)) - if m.PickBestRoute { - n += 2 - } - return n + return len(dAtA) - i, nil } -func (m *QueryEstimateMultiHopSwapResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulatePlaceLimitOrderResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - var l int - _ = l - l = m.CoinOut.Size() - n += 1 + l + sovQuery(uint64(l)) - return n + return dAtA[:n], nil } -func (m *QueryEstimatePlaceLimitOrderRequest) Size() (n int) { - if m == nil { - return 0 - } +func (m *QuerySimulatePlaceLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulatePlaceLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if m.Resp != nil { + { + size, err := m.Resp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenIn) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - l = len(m.TokenOut) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } - if m.TickIndexInToOut != 0 { - n += 1 + sovQuery(uint64(m.TickIndexInToOut)) - } - l = m.AmountIn.Size() - n += 1 + l + sovQuery(uint64(l)) - if m.OrderType != 0 { - n += 1 + sovQuery(uint64(m.OrderType)) - } - if m.ExpirationTime != nil { - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime) - n += 1 + l + sovQuery(uint64(l)) + return len(dAtA) - i, nil +} + +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - if m.MaxAmountOut != nil { - l = m.MaxAmountOut.Size() - n += 1 + l + sovQuery(uint64(l)) + return dAtA[:n], nil +} + +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Msg != nil { + { + size, err := m.Msg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryEstimatePlaceLimitOrderResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = m.TotalInCoin.Size() - n += 1 + l + sovQuery(uint64(l)) - l = m.SwapInCoin.Size() - n += 1 + l + sovQuery(uint64(l)) - l = m.SwapOutCoin.Size() - n += 1 + l + sovQuery(uint64(l)) - return n + if m.Resp != nil { + { + size, err := m.Resp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } -func (m *QueryPoolRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateCancelLimitOrderRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateCancelLimitOrderRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateCancelLimitOrderRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - l = len(m.PairId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) + if m.Msg != nil { + { + size, err := m.Msg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - if m.TickIndex != 0 { - n += 1 + sovQuery(uint64(m.TickIndex)) + return len(dAtA) - i, nil +} + +func (m *QuerySimulateCancelLimitOrderResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - if m.Fee != 0 { - n += 1 + sovQuery(uint64(m.Fee)) + return dAtA[:n], nil +} + +func (m *QuerySimulateCancelLimitOrderResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateCancelLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Resp != nil { + { + size, err := m.Resp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryPoolByIDRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateMultiHopSwapRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateMultiHopSwapRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateMultiHopSwapRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if m.PoolId != 0 { - n += 1 + sovQuery(uint64(m.PoolId)) + if m.Msg != nil { + { + size, err := m.Msg.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryPoolResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QuerySimulateMultiHopSwapResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *QuerySimulateMultiHopSwapResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QuerySimulateMultiHopSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if m.Pool != nil { - l = m.Pool.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.Resp != nil { + { + size, err := m.Resp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return n + return len(dAtA) - i, nil } -func (m *QueryGetPoolMetadataRequest) Size() (n int) { +func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { + offset -= sovQuery(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *QueryParamsRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Id != 0 { - n += 1 + sovQuery(uint64(m.Id)) - } return n } -func (m *QueryGetPoolMetadataResponse) Size() (n int) { +func (m *QueryParamsResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.PoolMetadata.Size() + l = m.Params.Size() n += 1 + l + sovQuery(uint64(l)) return n } -func (m *QueryAllPoolMetadataRequest) Size() (n int) { +func (m *QueryGetLimitOrderTrancheUserRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Pagination != nil { - l = m.Pagination.Size() + l = len(m.Address) + if l > 0 { n += 1 + l + sovQuery(uint64(l)) } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.CalcWithdrawableShares { + n += 2 + } return n } -func (m *QueryAllPoolMetadataResponse) Size() (n int) { +func (m *QueryGetLimitOrderTrancheUserResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.PoolMetadata) > 0 { - for _, e := range m.PoolMetadata { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + if m.LimitOrderTrancheUser != nil { + l = m.LimitOrderTrancheUser.Size() + n += 1 + l + sovQuery(uint64(l)) + } + if m.WithdrawableShares != nil { + l = m.WithdrawableShares.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllLimitOrderTrancheUserRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllLimitOrderTrancheUserResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.LimitOrderTrancheUser) > 0 { + for _, e := range m.LimitOrderTrancheUser { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetLimitOrderTrancheRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.TickIndex != 0 { + n += 1 + sovQuery(uint64(m.TickIndex)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetLimitOrderTrancheResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.LimitOrderTranche != nil { + l = m.LimitOrderTranche.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllLimitOrderTrancheRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllLimitOrderTrancheResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.LimitOrderTranche) > 0 { + for _, e := range m.LimitOrderTranche { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllUserDepositsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Address) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + if m.IncludePoolData { + n += 2 + } + return n +} + +func (m *QueryAllUserDepositsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Deposits) > 0 { + for _, e := range m.Deposits { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Address) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.LimitOrders) > 0 { + for _, e := range m.LimitOrders { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllTickLiquidityRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllTickLiquidityResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.TickLiquidity) > 0 { + for _, e := range m.TickLiquidity { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetInactiveLimitOrderTrancheRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.TickIndex != 0 { + n += 1 + sovQuery(uint64(m.TickIndex)) + } + l = len(m.TrancheKey) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetInactiveLimitOrderTrancheResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.InactiveLimitOrderTranche != nil { + l = m.InactiveLimitOrderTranche.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllInactiveLimitOrderTrancheRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllInactiveLimitOrderTrancheResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.InactiveLimitOrderTranche) > 0 { + for _, e := range m.InactiveLimitOrderTranche { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllPoolReservesRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllPoolReservesResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.PoolReserves) > 0 { + for _, e := range m.PoolReserves { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetPoolReservesRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.TickIndex != 0 { + n += 1 + sovQuery(uint64(m.TickIndex)) + } + if m.Fee != 0 { + n += 1 + sovQuery(uint64(m.Fee)) + } + return n +} + +func (m *QueryGetPoolReservesResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PoolReserves != nil { + l = m.PoolReserves.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryEstimateMultiHopSwapRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if len(m.Routes) > 0 { + for _, e := range m.Routes { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + l = m.AmountIn.Size() + n += 1 + l + sovQuery(uint64(l)) + l = m.ExitLimitPrice.Size() + n += 1 + l + sovQuery(uint64(l)) + if m.PickBestRoute { + n += 2 + } + return n +} + +func (m *QueryEstimateMultiHopSwapResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.CoinOut.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func (m *QueryEstimatePlaceLimitOrderRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenIn) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.TokenOut) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.TickIndexInToOut != 0 { + n += 1 + sovQuery(uint64(m.TickIndexInToOut)) + } + l = m.AmountIn.Size() + n += 1 + l + sovQuery(uint64(l)) + if m.OrderType != 0 { + n += 1 + sovQuery(uint64(m.OrderType)) + } + if m.ExpirationTime != nil { + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(*m.ExpirationTime) + n += 1 + l + sovQuery(uint64(l)) + } + if m.MaxAmountOut != nil { + l = m.MaxAmountOut.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryEstimatePlaceLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.TotalInCoin.Size() + n += 1 + l + sovQuery(uint64(l)) + l = m.SwapInCoin.Size() + n += 1 + l + sovQuery(uint64(l)) + l = m.SwapOutCoin.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func (m *QueryPoolRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PairId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.TickIndex != 0 { + n += 1 + sovQuery(uint64(m.TickIndex)) + } + if m.Fee != 0 { + n += 1 + sovQuery(uint64(m.Fee)) + } + return n +} + +func (m *QueryPoolByIDRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.PoolId != 0 { + n += 1 + sovQuery(uint64(m.PoolId)) + } + return n +} + +func (m *QueryPoolResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pool != nil { + l = m.Pool.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryGetPoolMetadataRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Id != 0 { + n += 1 + sovQuery(uint64(m.Id)) + } + return n +} + +func (m *QueryGetPoolMetadataResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.PoolMetadata.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func (m *QueryAllPoolMetadataRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllPoolMetadataResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.PoolMetadata) > 0 { + for _, e := range m.PoolMetadata { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateDepositRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Msg != nil { + l = m.Msg.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateDepositResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Resp != nil { + l = m.Resp.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateWithdrawalRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Msg != nil { + l = m.Msg.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateWithdrawalResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Resp != nil { + l = m.Resp.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulatePlaceLimitOrderRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Msg != nil { + l = m.Msg.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulatePlaceLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Resp != nil { + l = m.Resp.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Msg != nil { + l = m.Msg.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Resp != nil { + l = m.Resp.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateCancelLimitOrderRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Msg != nil { + l = m.Msg.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateCancelLimitOrderResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Resp != nil { + l = m.Resp.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateMultiHopSwapRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Msg != nil { + l = m.Msg.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QuerySimulateMultiHopSwapResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Resp != nil { + l = m.Resp.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func sovQuery(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozQuery(x uint64) (n int) { + return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TrancheKey", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TrancheKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CalcWithdrawableShares", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.CalcWithdrawableShares = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTrancheUser", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.LimitOrderTrancheUser == nil { + m.LimitOrderTrancheUser = &LimitOrderTrancheUser{} + } + if err := m.LimitOrderTrancheUser.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field WithdrawableShares", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var v cosmossdk_io_math.Int + m.WithdrawableShares = &v + if err := m.WithdrawableShares.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTrancheUser", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LimitOrderTrancheUser = append(m.LimitOrderTrancheUser, &LimitOrderTrancheUser{}) + if err := m.LimitOrderTrancheUser[len(m.LimitOrderTrancheUser)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PairId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) + } + m.TickIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TickIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TokenIn = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TrancheKey", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TrancheKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTranche", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.LimitOrderTranche == nil { + m.LimitOrderTranche = &LimitOrderTranche{} + } + if err := m.LimitOrderTranche.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PairId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TokenIn = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTranche", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.LimitOrderTranche = append(m.LimitOrderTranche, &LimitOrderTranche{}) + if err := m.LimitOrderTranche[len(m.LimitOrderTranche)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy } } - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } - return n -} -func sovQuery(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozQuery(x uint64) (n int) { - return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5053,12 +7551,100 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllUserDepositsRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllUserDepositsRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IncludePoolData", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.IncludePoolData = bool(v != 0) default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -5080,7 +7666,7 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllUserDepositsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5103,15 +7689,15 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllUserDepositsResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllUserDepositsResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Deposits", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5138,7 +7724,44 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Deposits = append(m.Deposits, &DepositRecord{}) + if err := m.Deposits[len(m.Deposits)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5163,7 +7786,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5186,10 +7809,10 @@ func (m *QueryGetLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5226,41 +7849,9 @@ func (m *QueryGetLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrancheKey", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TrancheKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CalcWithdrawableShares", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var v int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -5270,12 +7861,28 @@ func (m *QueryGetLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - m.CalcWithdrawableShares = bool(v != 0) + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -5297,7 +7904,7 @@ func (m *QueryGetLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5320,15 +7927,15 @@ func (m *QueryGetLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheUserResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTrancheUser", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field LimitOrders", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5355,18 +7962,16 @@ func (m *QueryGetLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.LimitOrderTrancheUser == nil { - m.LimitOrderTrancheUser = &LimitOrderTrancheUser{} - } - if err := m.LimitOrderTrancheUser.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.LimitOrders = append(m.LimitOrders, &LimitOrderTrancheUser{}) + if err := m.LimitOrders[len(m.LimitOrders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field WithdrawableShares", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -5376,25 +7981,25 @@ func (m *QueryGetLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - var v cosmossdk_io_math.Int - m.WithdrawableShares = &v - if err := m.WithdrawableShares.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5419,7 +8024,7 @@ func (m *QueryGetLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5442,13 +8047,77 @@ func (m *QueryAllLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllTickLiquidityRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllTickLiquidityRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PairId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TokenIn = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } @@ -5505,7 +8174,7 @@ func (m *QueryAllLimitOrderTrancheUserRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllTickLiquidityResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5528,15 +8197,15 @@ func (m *QueryAllLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllTickLiquidityResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllTickLiquidityResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTrancheUser", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TickLiquidity", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5563,8 +8232,8 @@ func (m *QueryAllLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.LimitOrderTrancheUser = append(m.LimitOrderTrancheUser, &LimitOrderTrancheUser{}) - if err := m.LimitOrderTrancheUser[len(m.LimitOrderTrancheUser)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.TickLiquidity = append(m.TickLiquidity, &TickLiquidity{}) + if err := m.TickLiquidity[len(m.TickLiquidity)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5625,7 +8294,7 @@ func (m *QueryAllLimitOrderTrancheUserResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { +func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5648,10 +8317,10 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5687,6 +8356,38 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TokenIn = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) } @@ -5705,11 +8406,93 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { break } } - case 3: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TrancheKey", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TrancheKey = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field InactiveLimitOrderTranche", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -5719,29 +8502,83 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.TokenIn = string(dAtA[iNdEx:postIndex]) + if m.InactiveLimitOrderTranche == nil { + m.InactiveLimitOrderTranche = &LimitOrderTranche{} + } + if err := m.InactiveLimitOrderTranche.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 4: + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrancheKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -5751,23 +8588,27 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.TrancheKey = string(dAtA[iNdEx:postIndex]) + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex default: iNdEx = preIndex @@ -5790,7 +8631,7 @@ func (m *QueryGetLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5813,15 +8654,15 @@ func (m *QueryGetLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTranche", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field InactiveLimitOrderTranche", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5848,10 +8689,44 @@ func (m *QueryGetLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.LimitOrderTranche == nil { - m.LimitOrderTranche = &LimitOrderTranche{} + m.InactiveLimitOrderTranche = append(m.InactiveLimitOrderTranche, &LimitOrderTranche{}) + if err := m.InactiveLimitOrderTranche[len(m.InactiveLimitOrderTranche)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - if err := m.LimitOrderTranche.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5876,7 +8751,7 @@ func (m *QueryGetLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5899,10 +8774,10 @@ func (m *QueryAllLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPoolReservesRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPoolReservesRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6026,7 +8901,7 @@ func (m *QueryAllLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllPoolReservesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6049,15 +8924,15 @@ func (m *QueryAllLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPoolReservesResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPoolReservesResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LimitOrderTranche", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PoolReserves", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6084,8 +8959,8 @@ func (m *QueryAllLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.LimitOrderTranche = append(m.LimitOrderTranche, &LimitOrderTranche{}) - if err := m.LimitOrderTranche[len(m.LimitOrderTranche)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.PoolReserves = append(m.PoolReserves, &PoolReserves{}) + if err := m.PoolReserves[len(m.PoolReserves)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -6146,7 +9021,7 @@ func (m *QueryAllLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6169,15 +9044,15 @@ func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllUserDepositsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetPoolReservesRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllUserDepositsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetPoolReservesRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6205,13 +9080,13 @@ func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Address = string(dAtA[iNdEx:postIndex]) + m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6221,33 +9096,29 @@ func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.TokenIn = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IncludePoolData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) } - var v int + m.TickIndex = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6257,12 +9128,30 @@ func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= int(b&0x7F) << shift + m.TickIndex |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) + } + m.Fee = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Fee |= uint64(b&0x7F) << shift if b < 0x80 { break } } - m.IncludePoolData = bool(v != 0) default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -6284,72 +9173,38 @@ func (m *QueryAllUserDepositsRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllUserDepositsResponse) Unmarshal(dAtA []byte) error { +func (m *QueryGetPoolReservesResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { preIndex := iNdEx var wire uint64 for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryAllUserDepositsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllUserDepositsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Deposits", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery + if shift >= 64 { + return ErrIntOverflowQuery } - if postIndex > l { + if iNdEx >= l { return io.ErrUnexpectedEOF } - m.Deposits = append(m.Deposits, &DepositRecord{}) - if err := m.Deposits[len(m.Deposits)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex - case 2: + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetPoolReservesResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetPoolReservesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PoolReserves", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6376,10 +9231,10 @@ func (m *QueryAllUserDepositsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} + if m.PoolReserves == nil { + m.PoolReserves = &PoolReserves{} } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.PoolReserves.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -6404,7 +9259,7 @@ func (m *QueryAllUserDepositsResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Unmarshal(dAtA []byte) error { +func (m *QueryEstimateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6427,15 +9282,15 @@ func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Unmarshal(dAtA []byte) e fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryEstimateMultiHopSwapRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryEstimateMultiHopSwapRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6463,13 +9318,13 @@ func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Unmarshal(dAtA []byte) e if postIndex > l { return io.ErrUnexpectedEOF } - m.Address = string(dAtA[iNdEx:postIndex]) + m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6479,83 +9334,63 @@ func (m *QueryAllLimitOrderTrancheUserByAddressRequest) Unmarshal(dAtA []byte) e } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Receiver = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Routes", wireType) } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF + if msglen < 0 { + return ErrInvalidLengthQuery } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery } - if iNdEx >= l { + if postIndex > l { return io.ErrUnexpectedEOF } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + m.Routes = append(m.Routes, &MultiHopRoute{}) + if err := m.Routes[len(m.Routes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllLimitOrderTrancheUserByAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + iNdEx = postIndex + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LimitOrders", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AmountIn", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6565,31 +9400,31 @@ func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Unmarshal(dAtA []byte) } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.LimitOrders = append(m.LimitOrders, &LimitOrderTrancheUser{}) - if err := m.LimitOrders[len(m.LimitOrders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.AmountIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 2: + case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ExitLimitPrice", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6599,28 +9434,46 @@ func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Unmarshal(dAtA []byte) } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.ExitLimitPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PickBestRoute", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.PickBestRoute = bool(v != 0) default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -6642,7 +9495,7 @@ func (m *QueryAllLimitOrderTrancheUserByAddressResponse) Unmarshal(dAtA []byte) } return nil } -func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { +func (m *QueryEstimateMultiHopSwapResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6665,79 +9518,15 @@ func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllTickLiquidityRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryEstimateMultiHopSwapResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllTickLiquidityRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryEstimateMultiHopSwapResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PairId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TokenIn = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CoinOut", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6764,10 +9553,7 @@ func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.CoinOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -6792,7 +9578,7 @@ func (m *QueryAllTickLiquidityRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllTickLiquidityResponse) Unmarshal(dAtA []byte) error { +func (m *QueryEstimatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -6815,17 +9601,17 @@ func (m *QueryAllTickLiquidityResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllTickLiquidityResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllTickLiquidityResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TickLiquidity", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6835,31 +9621,29 @@ func (m *QueryAllTickLiquidityResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.TickLiquidity = append(m.TickLiquidity, &TickLiquidity{}) - if err := m.TickLiquidity[len(m.TickLiquidity)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -6869,81 +9653,27 @@ func (m *QueryAllTickLiquidityResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Receiver = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6971,11 +9701,11 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - m.PairId = string(dAtA[iNdEx:postIndex]) + m.TokenIn = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TokenOut", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7003,13 +9733,13 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - m.TokenIn = string(dAtA[iNdEx:postIndex]) + m.TokenOut = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 5: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TickIndexInToOut", wireType) } - m.TickIndex = 0 + m.TickIndexInToOut = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7019,14 +9749,14 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error } b := dAtA[iNdEx] iNdEx++ - m.TickIndex |= int64(b&0x7F) << shift + m.TickIndexInToOut |= int64(b&0x7F) << shift if b < 0x80 { break } } - case 4: + case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TrancheKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AmountIn", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7054,61 +9784,32 @@ func (m *QueryGetInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - m.TrancheKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { + if err := m.AmountIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryGetInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF + iNdEx = postIndex + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field OrderType", wireType) } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + m.OrderType = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.OrderType |= LimitOrderType(b&0x7F) << shift + if b < 0x80 { + break + } } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetInactiveLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 8: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InactiveLimitOrderTranche", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ExpirationTime", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7135,68 +9836,18 @@ func (m *QueryGetInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - if m.InactiveLimitOrderTranche == nil { - m.InactiveLimitOrderTranche = &LimitOrderTranche{} + if m.ExpirationTime == nil { + m.ExpirationTime = new(time.Time) } - if err := m.InactiveLimitOrderTranche.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.ExpirationTime, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipQuery(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthQuery - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *QueryAllInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: + case 9: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field MaxAmountOut", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7206,25 +9857,25 @@ func (m *QueryAllInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + var v cosmossdk_io_math.Int + m.MaxAmountOut = &v + if err := m.MaxAmountOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7249,7 +9900,7 @@ func (m *QueryAllInactiveLimitOrderTrancheRequest) Unmarshal(dAtA []byte) error } return nil } -func (m *QueryAllInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error { +func (m *QueryEstimatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7272,15 +9923,15 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllInactiveLimitOrderTrancheResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field InactiveLimitOrderTranche", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TotalInCoin", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7307,14 +9958,13 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - m.InactiveLimitOrderTranche = append(m.InactiveLimitOrderTranche, &LimitOrderTranche{}) - if err := m.InactiveLimitOrderTranche[len(m.InactiveLimitOrderTranche)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TotalInCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SwapInCoin", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7341,10 +9991,40 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} + if err := m.SwapInCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SwapOutCoin", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.SwapOutCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7369,7 +10049,7 @@ func (m *QueryAllInactiveLimitOrderTrancheResponse) Unmarshal(dAtA []byte) error } return nil } -func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7392,10 +10072,10 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPoolReservesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPoolRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPoolReservesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPoolRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -7431,10 +10111,10 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { m.PairId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) } - var stringLen uint64 + m.TickIndex = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7444,29 +10124,16 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + m.TickIndex |= int64(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TokenIn = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } - var msglen int + m.Fee = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7476,28 +10143,11 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.Fee |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} - } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -7519,7 +10169,7 @@ func (m *QueryAllPoolReservesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPoolReservesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7542,17 +10192,17 @@ func (m *QueryAllPoolReservesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPoolReservesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryPoolByIDRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPoolReservesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryPoolByIDRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolReserves", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PoolId", wireType) } - var msglen int + m.PoolId = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7562,29 +10212,64 @@ func (m *QueryAllPoolReservesResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.PoolId |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthQuery + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err } - postIndex := iNdEx + msglen - if postIndex < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthQuery } - if postIndex > l { + if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.PoolReserves = append(m.PoolReserves, &PoolReserves{}) - if err := m.PoolReserves[len(m.PoolReserves)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryPoolResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery } - iNdEx = postIndex - case 2: + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryPoolResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryPoolResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pool", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7611,13 +10296,82 @@ func (m *QueryAllPoolReservesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} + if m.Pool == nil { + m.Pool = &Pool{} } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pool.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { return err } - iNdEx = postIndex + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryGetPoolMetadataRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryGetPoolMetadataRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryGetPoolMetadataRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + } + m.Id = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Id |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -7639,7 +10393,7 @@ func (m *QueryAllPoolReservesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { +func (m *QueryGetPoolMetadataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7662,17 +10416,17 @@ func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetPoolReservesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryGetPoolMetadataResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetPoolReservesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryGetPoolMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PoolMetadata", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -7682,94 +10436,25 @@ func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.PairId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF + if err := m.PoolMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.TokenIn = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) - } - m.TickIndex = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TickIndex |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) - } - m.Fee = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Fee |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -7791,7 +10476,7 @@ func (m *QueryGetPoolReservesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetPoolReservesResponse) Unmarshal(dAtA []byte) error { +func (m *QueryAllPoolMetadataRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7814,15 +10499,15 @@ func (m *QueryGetPoolReservesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetPoolReservesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPoolMetadataRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetPoolReservesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPoolMetadataRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolReserves", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7849,10 +10534,10 @@ func (m *QueryGetPoolReservesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.PoolReserves == nil { - m.PoolReserves = &PoolReserves{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.PoolReserves.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -7877,7 +10562,7 @@ func (m *QueryGetPoolReservesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryEstimateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { +func (m *QueryAllPoolMetadataResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -7900,79 +10585,15 @@ func (m *QueryEstimateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryEstimateMultiHopSwapRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryAllPoolMetadataResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryEstimateMultiHopSwapRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryAllPoolMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Creator = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Routes", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PoolMetadata", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -7999,50 +10620,16 @@ func (m *QueryEstimateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Routes = append(m.Routes, &MultiHopRoute{}) - if err := m.Routes[len(m.Routes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AmountIn", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.AmountIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.PoolMetadata = append(m.PoolMetadata, PoolMetadata{}) + if err := m.PoolMetadata[len(m.PoolMetadata)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 5: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExitLimitPrice", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8052,46 +10639,28 @@ func (m *QueryEstimateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.ExitLimitPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 6: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PickBestRoute", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - m.PickBestRoute = bool(v != 0) + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -8113,7 +10682,7 @@ func (m *QueryEstimateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryEstimateMultiHopSwapResponse) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateDepositRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8136,15 +10705,15 @@ func (m *QueryEstimateMultiHopSwapResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryEstimateMultiHopSwapResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateDepositRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryEstimateMultiHopSwapResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateDepositRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CoinOut", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8171,7 +10740,10 @@ func (m *QueryEstimateMultiHopSwapResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.CoinOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Msg == nil { + m.Msg = &MsgDeposit{} + } + if err := m.Msg.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8196,7 +10768,7 @@ func (m *QueryEstimateMultiHopSwapResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryEstimatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateDepositResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8219,81 +10791,17 @@ func (m *QueryEstimatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateDepositResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateDepositResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Creator = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenIn", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Resp", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8303,169 +10811,83 @@ func (m *QueryEstimatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.TokenIn = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokenOut", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery + if m.Resp == nil { + m.Resp = &MsgDepositResponse{} } - if postIndex > l { - return io.ErrUnexpectedEOF + if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.TokenOut = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TickIndexInToOut", wireType) - } - m.TickIndexInToOut = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TickIndexInToOut |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AmountIn", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err } - postIndex := iNdEx + intStringLen - if postIndex < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthQuery } - if postIndex > l { + if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - if err := m.AmountIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field OrderType", wireType) - } - m.OrderType = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.OrderType |= LimitOrderType(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpirationTime", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QuerySimulateWithdrawalRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery } - if postIndex > l { + if iNdEx >= l { return io.ErrUnexpectedEOF } - if m.ExpirationTime == nil { - m.ExpirationTime = new(time.Time) - } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(m.ExpirationTime, dAtA[iNdEx:postIndex]); err != nil { - return err + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex - case 9: + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QuerySimulateWithdrawalRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QuerySimulateWithdrawalRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MaxAmountOut", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8475,25 +10897,25 @@ func (m *QueryEstimatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - var v cosmossdk_io_math.Int - m.MaxAmountOut = &v - if err := m.MaxAmountOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Msg == nil { + m.Msg = &MsgWithdrawal{} + } + if err := m.Msg.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8518,7 +10940,7 @@ func (m *QueryEstimatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryEstimatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateWithdrawalResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8541,15 +10963,15 @@ func (m *QueryEstimatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateWithdrawalResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryEstimatePlaceLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateWithdrawalResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TotalInCoin", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Resp", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8576,46 +10998,66 @@ func (m *QueryEstimatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.TotalInCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Resp == nil { + m.Resp = &MsgWithdrawalResponse{} + } + if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapInCoin", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err } - if msglen < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF } - if postIndex > l { + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QuerySimulatePlaceLimitOrderRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { return io.ErrUnexpectedEOF } - if err := m.SwapInCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex - case 3: + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QuerySimulatePlaceLimitOrderRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QuerySimulatePlaceLimitOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapOutCoin", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8642,7 +11084,10 @@ func (m *QueryEstimatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.SwapOutCoin.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Msg == nil { + m.Msg = &MsgPlaceLimitOrder{} + } + if err := m.Msg.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8667,7 +11112,7 @@ func (m *QueryEstimatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySimulatePlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8690,17 +11135,17 @@ func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPoolRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulatePlaceLimitOrderResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPoolRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulatePlaceLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PairId", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Resp", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8710,62 +11155,28 @@ func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.PairId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TickIndex", wireType) - } - m.TickIndex = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TickIndex |= int64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) + if m.Resp == nil { + m.Resp = &MsgPlaceLimitOrderResponse{} } - m.Fee = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Fee |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } + if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -8787,7 +11198,7 @@ func (m *QueryPoolRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateWithdrawFilledLimitOrderRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8810,17 +11221,17 @@ func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPoolByIDRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateWithdrawFilledLimitOrderRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPoolByIDRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateWithdrawFilledLimitOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolId", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType) } - m.PoolId = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8830,11 +11241,28 @@ func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.PoolId |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Msg == nil { + m.Msg = &MsgWithdrawFilledLimitOrder{} + } + if err := m.Msg.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -8856,7 +11284,7 @@ func (m *QueryPoolByIDRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryPoolResponse) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateWithdrawFilledLimitOrderResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8879,15 +11307,15 @@ func (m *QueryPoolResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryPoolResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateWithdrawFilledLimitOrderResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryPoolResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateWithdrawFilledLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pool", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Resp", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8914,10 +11342,10 @@ func (m *QueryPoolResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pool == nil { - m.Pool = &Pool{} + if m.Resp == nil { + m.Resp = &MsgWithdrawFilledLimitOrderResponse{} } - if err := m.Pool.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -8942,7 +11370,7 @@ func (m *QueryPoolResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetPoolMetadataRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateCancelLimitOrderRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8965,17 +11393,17 @@ func (m *QueryGetPoolMetadataRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetPoolMetadataRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateCancelLimitOrderRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetPoolMetadataRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateCancelLimitOrderRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType) } - m.Id = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -8985,11 +11413,28 @@ func (m *QueryGetPoolMetadataRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Id |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Msg == nil { + m.Msg = &MsgCancelLimitOrder{} + } + if err := m.Msg.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -9011,7 +11456,7 @@ func (m *QueryGetPoolMetadataRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetPoolMetadataResponse) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateCancelLimitOrderResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9034,15 +11479,15 @@ func (m *QueryGetPoolMetadataResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetPoolMetadataResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateCancelLimitOrderResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetPoolMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateCancelLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolMetadata", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Resp", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9069,7 +11514,10 @@ func (m *QueryGetPoolMetadataResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.PoolMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Resp == nil { + m.Resp = &MsgCancelLimitOrderResponse{} + } + if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -9094,7 +11542,7 @@ func (m *QueryGetPoolMetadataResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPoolMetadataRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateMultiHopSwapRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9117,15 +11565,15 @@ func (m *QueryAllPoolMetadataRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPoolMetadataRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateMultiHopSwapRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPoolMetadataRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateMultiHopSwapRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Msg", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9152,10 +11600,10 @@ func (m *QueryAllPoolMetadataRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageRequest{} + if m.Msg == nil { + m.Msg = &MsgMultiHopSwap{} } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Msg.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -9180,7 +11628,7 @@ func (m *QueryAllPoolMetadataRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryAllPoolMetadataResponse) Unmarshal(dAtA []byte) error { +func (m *QuerySimulateMultiHopSwapResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9203,49 +11651,15 @@ func (m *QueryAllPoolMetadataResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryAllPoolMetadataResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySimulateMultiHopSwapResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryAllPoolMetadataResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySimulateMultiHopSwapResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolMetadata", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PoolMetadata = append(m.PoolMetadata, PoolMetadata{}) - if err := m.PoolMetadata[len(m.PoolMetadata)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Resp", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9272,10 +11686,10 @@ func (m *QueryAllPoolMetadataResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Pagination == nil { - m.Pagination = &query.PageResponse{} + if m.Resp == nil { + m.Resp = &MsgMultiHopSwapResponse{} } - if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Resp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/dex/types/query.pb.gw.go b/x/dex/types/query.pb.gw.go index d460afbaa..072db61b8 100644 --- a/x/dex/types/query.pb.gw.go +++ b/x/dex/types/query.pb.gw.go @@ -1473,6 +1473,222 @@ func local_request_Query_PoolMetadataAll_0(ctx context.Context, marshaler runtim } +var ( + filter_Query_SimulateDeposit_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_SimulateDeposit_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateDepositRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateDeposit_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.SimulateDeposit(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_SimulateDeposit_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateDepositRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateDeposit_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SimulateDeposit(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_SimulateWithdrawal_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_SimulateWithdrawal_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateWithdrawalRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateWithdrawal_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.SimulateWithdrawal(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_SimulateWithdrawal_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateWithdrawalRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateWithdrawal_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SimulateWithdrawal(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_SimulatePlaceLimitOrder_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_SimulatePlaceLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulatePlaceLimitOrderRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulatePlaceLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.SimulatePlaceLimitOrder(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_SimulatePlaceLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulatePlaceLimitOrderRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulatePlaceLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SimulatePlaceLimitOrder(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_SimulateWithdrawFilledLimitOrder_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_SimulateWithdrawFilledLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateWithdrawFilledLimitOrderRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateWithdrawFilledLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.SimulateWithdrawFilledLimitOrder(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_SimulateWithdrawFilledLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateWithdrawFilledLimitOrderRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateWithdrawFilledLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SimulateWithdrawFilledLimitOrder(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_SimulateCancelLimitOrder_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_SimulateCancelLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateCancelLimitOrderRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateCancelLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.SimulateCancelLimitOrder(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_SimulateCancelLimitOrder_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateCancelLimitOrderRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateCancelLimitOrder_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SimulateCancelLimitOrder(ctx, &protoReq) + return msg, metadata, err + +} + +var ( + filter_Query_SimulateMultiHopSwap_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_SimulateMultiHopSwap_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateMultiHopSwapRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateMultiHopSwap_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.SimulateMultiHopSwap(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_SimulateMultiHopSwap_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySimulateMultiHopSwapRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SimulateMultiHopSwap_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.SimulateMultiHopSwap(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -1939,6 +2155,144 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_SimulateDeposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_SimulateDeposit_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateDeposit_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateWithdrawal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_SimulateWithdrawal_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateWithdrawal_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulatePlaceLimitOrder_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_SimulatePlaceLimitOrder_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulatePlaceLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateWithdrawFilledLimitOrder_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_SimulateWithdrawFilledLimitOrder_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateWithdrawFilledLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateCancelLimitOrder_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_SimulateCancelLimitOrder_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateCancelLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateMultiHopSwap_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_SimulateMultiHopSwap_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateMultiHopSwap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -2380,6 +2734,126 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_SimulateDeposit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_SimulateDeposit_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateDeposit_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateWithdrawal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_SimulateWithdrawal_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateWithdrawal_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulatePlaceLimitOrder_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_SimulatePlaceLimitOrder_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulatePlaceLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateWithdrawFilledLimitOrder_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_SimulateWithdrawFilledLimitOrder_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateWithdrawFilledLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateCancelLimitOrder_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_SimulateCancelLimitOrder_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateCancelLimitOrder_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_SimulateMultiHopSwap_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_SimulateMultiHopSwap_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_SimulateMultiHopSwap_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -2423,6 +2897,18 @@ var ( pattern_Query_PoolMetadata_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"neutron", "dex", "pool_metadata", "id"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_PoolMetadataAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "pool_metadata"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_SimulateDeposit_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "simulate_deposit"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_SimulateWithdrawal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "simulate_withdrawal"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_SimulatePlaceLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "simulate_place_limit_order"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_SimulateWithdrawFilledLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "simulate_withdraw_filled_limit_order"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_SimulateCancelLimitOrder_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "simulate_cancel_limit_order"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_SimulateMultiHopSwap_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"neutron", "dex", "pool_metadata"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -2465,4 +2951,16 @@ var ( forward_Query_PoolMetadata_0 = runtime.ForwardResponseMessage forward_Query_PoolMetadataAll_0 = runtime.ForwardResponseMessage + + forward_Query_SimulateDeposit_0 = runtime.ForwardResponseMessage + + forward_Query_SimulateWithdrawal_0 = runtime.ForwardResponseMessage + + forward_Query_SimulatePlaceLimitOrder_0 = runtime.ForwardResponseMessage + + forward_Query_SimulateWithdrawFilledLimitOrder_0 = runtime.ForwardResponseMessage + + forward_Query_SimulateCancelLimitOrder_0 = runtime.ForwardResponseMessage + + forward_Query_SimulateMultiHopSwap_0 = runtime.ForwardResponseMessage ) diff --git a/x/dex/types/tick_liquidity.go b/x/dex/types/tick_liquidity.go index dcc1b5419..26ca3ab96 100644 --- a/x/dex/types/tick_liquidity.go +++ b/x/dex/types/tick_liquidity.go @@ -1,7 +1,7 @@ package types import ( - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) // NOTE: These methods should be avoided if possible. diff --git a/x/dex/types/tick_liquidity.pb.go b/x/dex/types/tick_liquidity.pb.go index c35f64b63..4459f7771 100644 --- a/x/dex/types/tick_liquidity.pb.go +++ b/x/dex/types/tick_liquidity.pb.go @@ -131,8 +131,8 @@ var fileDescriptor_fda22cbad7301397 = []byte{ 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xdd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x2d, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, - 0x89, 0x7e, 0x05, 0x24, 0xd4, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x41, 0x60, 0x0c, 0x08, - 0x00, 0x00, 0xff, 0xff, 0x09, 0x66, 0xc9, 0x03, 0x91, 0x01, 0x00, 0x00, + 0xa9, 0x7e, 0x05, 0x24, 0xd4, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x41, 0x60, 0x0c, 0x08, + 0x00, 0x00, 0xff, 0xff, 0x97, 0xe5, 0x13, 0x9c, 0x91, 0x01, 0x00, 0x00, } func (m *TickLiquidity) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/tick_liquidity_key.go b/x/dex/types/tick_liquidity_key.go index 9ea116cfe..fe33d7899 100644 --- a/x/dex/types/tick_liquidity_key.go +++ b/x/dex/types/tick_liquidity_key.go @@ -1,6 +1,6 @@ package types -import math_utils "github.com/neutron-org/neutron/v4/utils/math" +import math_utils "github.com/neutron-org/neutron/v5/utils/math" type TickLiquidityKey interface { KeyMarshal() []byte diff --git a/x/dex/types/tick_liquidity_test.go b/x/dex/types/tick_liquidity_test.go index 000251832..6591eea61 100644 --- a/x/dex/types/tick_liquidity_test.go +++ b/x/dex/types/tick_liquidity_test.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" "github.com/stretchr/testify/assert" - "github.com/neutron-org/neutron/v4/x/dex/types" + "github.com/neutron-org/neutron/v5/x/dex/types" ) func TestHasTokenEmptyReserves(t *testing.T) { diff --git a/x/dex/types/trade_pair_id.go b/x/dex/types/trade_pair_id.go index 54b8469b6..2f6f33c23 100644 --- a/x/dex/types/trade_pair_id.go +++ b/x/dex/types/trade_pair_id.go @@ -3,7 +3,7 @@ package types import ( sdkerrors "cosmossdk.io/errors" - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) func NewTradePairID(takerDenom, makerDenom string) (*TradePairID, error) { @@ -68,7 +68,7 @@ func (p TradePairID) MustPairID() *PairID { } func (p TradePairID) PairID() (*PairID, error) { - return NewPairIDFromUnsorted(p.MakerDenom, p.TakerDenom) + return NewPairID(p.MakerDenom, p.TakerDenom) } func (p TradePairID) Reversed() *TradePairID { diff --git a/x/dex/types/trade_pair_id.pb.go b/x/dex/types/trade_pair_id.pb.go index d2d64ef4e..e881507f6 100644 --- a/x/dex/types/trade_pair_id.pb.go +++ b/x/dex/types/trade_pair_id.pb.go @@ -91,9 +91,9 @@ var fileDescriptor_e0082302b8bd9607 = []byte{ 0x14, 0x30, 0x43, 0x14, 0x94, 0xc0, 0x15, 0x38, 0xb9, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x6e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, - 0xd4, 0x09, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0x89, 0x7e, 0x05, 0xc4, 0xd1, 0x95, - 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xd7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x31, 0x99, - 0x56, 0x83, 0xd0, 0x00, 0x00, 0x00, + 0xd4, 0x09, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0xc4, 0xd1, 0x95, + 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xd7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x1a, + 0x8c, 0x1c, 0xd0, 0x00, 0x00, 0x00, } func (m *TradePairID) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/types/tx.pb.go b/x/dex/types/tx.pb.go index 433e795c2..c4059c38b 100644 --- a/x/dex/types/tx.pb.go +++ b/x/dex/types/tx.pb.go @@ -16,7 +16,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + github_com_neutron_org_neutron_v5_utils_math "github.com/neutron-org/neutron/v5/utils/math" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -272,9 +272,10 @@ func (m *FailedDeposit) GetError() string { } type MsgDepositResponse struct { - Reserve0Deposited []cosmossdk_io_math.Int `protobuf:"bytes,1,rep,name=reserve0_deposited,json=reserve0Deposited,proto3,customtype=cosmossdk.io/math.Int" json:"reserve0_deposited" yaml:"reserve0_deposited"` - Reserve1Deposited []cosmossdk_io_math.Int `protobuf:"bytes,2,rep,name=reserve1_deposited,json=reserve1Deposited,proto3,customtype=cosmossdk.io/math.Int" json:"reserve1_deposited" yaml:"reserve1_deposited"` - FailedDeposits []*FailedDeposit `protobuf:"bytes,3,rep,name=failed_deposits,json=failedDeposits,proto3" json:"failed_deposits,omitempty"` + Reserve0Deposited []cosmossdk_io_math.Int `protobuf:"bytes,1,rep,name=reserve0_deposited,json=reserve0Deposited,proto3,customtype=cosmossdk.io/math.Int" json:"reserve0_deposited" yaml:"reserve0_deposited"` + Reserve1Deposited []cosmossdk_io_math.Int `protobuf:"bytes,2,rep,name=reserve1_deposited,json=reserve1Deposited,proto3,customtype=cosmossdk.io/math.Int" json:"reserve1_deposited" yaml:"reserve1_deposited"` + FailedDeposits []*FailedDeposit `protobuf:"bytes,3,rep,name=failed_deposits,json=failedDeposits,proto3" json:"failed_deposits,omitempty"` + SharesIssued []github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,4,rep,name=shares_issued,json=sharesIssued,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"shares_issued" yaml:"shares_issued"` } func (m *MsgDepositResponse) Reset() { *m = MsgDepositResponse{} } @@ -403,6 +404,9 @@ func (m *MsgWithdrawal) GetFees() []uint64 { } type MsgWithdrawalResponse struct { + Reserve0Withdrawn cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=reserve0_withdrawn,json=reserve0Withdrawn,proto3,customtype=cosmossdk.io/math.Int" json:"reserve0_withdrawn" yaml:"reserve0_withdrawn"` + Reserve1Withdrawn cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=reserve1_withdrawn,json=reserve1Withdrawn,proto3,customtype=cosmossdk.io/math.Int" json:"reserve1_withdrawn" yaml:"reserve1_withdrawn"` + SharesBurned []github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,rep,name=shares_burned,json=sharesBurned,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"shares_burned" yaml:"shares_burned"` } func (m *MsgWithdrawalResponse) Reset() { *m = MsgWithdrawalResponse{} } @@ -450,7 +454,7 @@ type MsgPlaceLimitOrder struct { // expirationTime is only valid iff orderType == GOOD_TIL_TIME. ExpirationTime *time.Time `protobuf:"bytes,9,opt,name=expiration_time,json=expirationTime,proto3,stdtime" json:"expiration_time,omitempty"` MaxAmountOut *cosmossdk_io_math.Int `protobuf:"bytes,10,opt,name=max_amount_out,json=maxAmountOut,proto3,customtype=cosmossdk.io/math.Int" json:"max_amount_out" yaml:"max_amount_out"` - LimitSellPrice *github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,11,opt,name=limit_sell_price,json=limitSellPrice,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"limit_sell_price" yaml:"limit_sell_price"` + LimitSellPrice *github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,11,opt,name=limit_sell_price,json=limitSellPrice,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"limit_sell_price" yaml:"limit_sell_price"` } func (m *MsgPlaceLimitOrder) Reset() { *m = MsgPlaceLimitOrder{} } @@ -545,6 +549,8 @@ type MsgPlaceLimitOrderResponse struct { // executing the limit order. It does not include any future proceeds from the // maker portion which will have withdrawn in the future TakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,opt,name=taker_coin_out,json=takerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"taker_coin_out" yaml:"taker_coin_out"` + // Total amount of the token in that was immediately swapped for takerOutCoin + TakerCoinIn github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,4,opt,name=taker_coin_in,json=takerCoinIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"taker_coin_in" yaml:"taker_coin_in"` } func (m *MsgPlaceLimitOrderResponse) Reset() { *m = MsgPlaceLimitOrderResponse{} } @@ -640,6 +646,10 @@ func (m *MsgWithdrawFilledLimitOrder) GetTrancheKey() string { } type MsgWithdrawFilledLimitOrderResponse struct { + // Total amount of taker reserves that were withdrawn + TakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=taker_coin_out,json=takerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"taker_coin_out" yaml:"taker_coin_out"` + // Total amount of maker reserves that were withdrawn --only applies to inactive LimitOrders + MakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=maker_coin_out,json=makerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"maker_coin_out" yaml:"maker_coin_out"` } func (m *MsgWithdrawFilledLimitOrderResponse) Reset() { *m = MsgWithdrawFilledLimitOrderResponse{} } @@ -728,6 +738,10 @@ func (m *MsgCancelLimitOrder) GetTrancheKey() string { } type MsgCancelLimitOrderResponse struct { + // Total amount of taker reserves that were withdrawn + TakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=taker_coin_out,json=takerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"taker_coin_out" yaml:"taker_coin_out"` + // Total amount of maker reserves that were canceled + MakerCoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,2,opt,name=maker_coin_out,json=makerCoinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"maker_coin_out" yaml:"maker_coin_out"` } func (m *MsgCancelLimitOrderResponse) Reset() { *m = MsgCancelLimitOrderResponse{} } @@ -812,7 +826,7 @@ type MsgMultiHopSwap struct { Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` Routes []*MultiHopRoute `protobuf:"bytes,3,rep,name=routes,proto3" json:"routes,omitempty"` AmountIn cosmossdk_io_math.Int `protobuf:"bytes,4,opt,name=amount_in,json=amountIn,proto3,customtype=cosmossdk.io/math.Int" json:"amount_in" yaml:"amount_in"` - ExitLimitPrice github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"exit_limit_price" yaml:"exit_limit_price"` + ExitLimitPrice github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,5,opt,name=exit_limit_price,json=exitLimitPrice,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"exit_limit_price" yaml:"exit_limit_price"` // If pickBestRoute == true then all routes are run and the route with the // best price is chosen otherwise, the first succesful route is used. PickBestRoute bool `protobuf:"varint,6,opt,name=pick_best_route,json=pickBestRoute,proto3" json:"pick_best_route,omitempty"` @@ -880,7 +894,9 @@ func (m *MsgMultiHopSwap) GetPickBestRoute() bool { } type MsgMultiHopSwapResponse struct { - CoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=coin_out,json=coinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coin_out"` + CoinOut github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,1,opt,name=coin_out,json=coinOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"coin_out" yaml:"coin_out"` + Route *MultiHopRoute `protobuf:"bytes,2,opt,name=route,proto3" json:"route,omitempty"` + Dust []github_com_cosmos_cosmos_sdk_types.Coin `protobuf:"bytes,3,rep,name=dust,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coin" json:"dust" yaml:"dust"` } func (m *MsgMultiHopSwapResponse) Reset() { *m = MsgMultiHopSwapResponse{} } @@ -916,6 +932,13 @@ func (m *MsgMultiHopSwapResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgMultiHopSwapResponse proto.InternalMessageInfo +func (m *MsgMultiHopSwapResponse) GetRoute() *MultiHopRoute { + if m != nil { + return m.Route + } + return nil +} + type MsgUpdateParams struct { // Authority is the address of the governance account. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` @@ -1034,113 +1057,126 @@ func init() { func init() { proto.RegisterFile("neutron/dex/tx.proto", fileDescriptor_a489f6e187d5e074) } var fileDescriptor_a489f6e187d5e074 = []byte{ - // 1687 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0x4f, 0xdb, 0x89, 0x3f, 0x2a, 0x89, 0xe3, 0x74, 0x32, 0xeb, 0x8e, 0x07, 0xdc, 0x56, 0xcf, - 0xb2, 0x63, 0x22, 0x62, 0x4f, 0xc2, 0xb2, 0x07, 0x23, 0x21, 0xd9, 0xf9, 0xd8, 0x35, 0x6b, 0xaf, - 0xa3, 0x8e, 0x57, 0x48, 0xbb, 0x12, 0x4d, 0xdb, 0x5d, 0x71, 0x5a, 0x69, 0x77, 0x99, 0xae, 0xb2, - 0xd7, 0xe1, 0xc2, 0x8a, 0xe3, 0x8a, 0xc3, 0x5c, 0x38, 0xf1, 0x0f, 0xc0, 0x6d, 0x0e, 0x9c, 0x39, - 0xe7, 0xc6, 0x08, 0x09, 0x09, 0x81, 0x30, 0x68, 0xe6, 0x30, 0xd2, 0x1c, 0x73, 0xe6, 0x80, 0xaa, - 0xba, 0xfa, 0xc3, 0xed, 0x7c, 0x4c, 0x86, 0xd1, 0x5e, 0xe2, 0xaa, 0xf7, 0x5e, 0xbd, 0x7a, 0xf5, - 0x7b, 0xef, 0xfd, 0xaa, 0x3a, 0x60, 0xd3, 0x86, 0x23, 0xe2, 0x20, 0xbb, 0x62, 0xc0, 0x49, 0x85, - 0x4c, 0xca, 0x43, 0x07, 0x11, 0x24, 0x2e, 0x73, 0x69, 0xd9, 0x80, 0x93, 0xfc, 0xba, 0x3e, 0x30, - 0x6d, 0x54, 0x61, 0x7f, 0x5d, 0x7d, 0xbe, 0xd0, 0x43, 0x78, 0x80, 0x70, 0xa5, 0xab, 0x63, 0x58, - 0x19, 0xef, 0x76, 0x21, 0xd1, 0x77, 0x2b, 0x3d, 0x64, 0xda, 0x5c, 0x9f, 0xe3, 0xfa, 0x01, 0xee, - 0x57, 0xc6, 0xbb, 0xf4, 0x87, 0x2b, 0xb6, 0x5c, 0x85, 0xc6, 0x66, 0x15, 0x77, 0xc2, 0x55, 0x9b, - 0x7d, 0xd4, 0x47, 0xae, 0x9c, 0x8e, 0xb8, 0x54, 0xee, 0x23, 0xd4, 0xb7, 0x60, 0x85, 0xcd, 0xba, - 0xa3, 0xd3, 0x0a, 0x31, 0x07, 0x10, 0x13, 0x7d, 0x30, 0xe4, 0x06, 0x52, 0xf8, 0x00, 0x43, 0xdd, - 0xd1, 0x07, 0xdc, 0xa1, 0xf2, 0x0b, 0x90, 0x39, 0x80, 0x43, 0x84, 0x4d, 0xd2, 0x1e, 0x12, 0x13, - 0xd9, 0x58, 0xfc, 0x3e, 0xc8, 0x1a, 0x26, 0xd6, 0xbb, 0x16, 0xd4, 0xf4, 0x11, 0x41, 0xf8, 0x2b, - 0x7d, 0x28, 0x09, 0x45, 0xa1, 0x94, 0x52, 0xd7, 0xb8, 0xbc, 0xc6, 0xc5, 0xe2, 0x23, 0x90, 0x39, - 0xd5, 0x4d, 0x4b, 0x23, 0x13, 0x0d, 0xd9, 0x5a, 0x17, 0x5a, 0x52, 0x8c, 0x19, 0x2e, 0x53, 0x69, - 0x67, 0xd2, 0xb6, 0xeb, 0xd0, 0x52, 0x2e, 0xe3, 0x00, 0xb4, 0x70, 0x9f, 0xef, 0x22, 0x4a, 0x20, - 0xd9, 0x73, 0xa0, 0x4e, 0x90, 0xc3, 0xbc, 0xa6, 0x55, 0x6f, 0x2a, 0xe6, 0x41, 0xca, 0x81, 0x3d, - 0x68, 0x8e, 0xa1, 0xc3, 0xfc, 0xa4, 0x55, 0x7f, 0x2e, 0xe6, 0x40, 0x92, 0xa0, 0x73, 0x68, 0x6b, - 0xba, 0x14, 0x67, 0xaa, 0x04, 0x9b, 0xd6, 0x02, 0x45, 0x57, 0x5a, 0x0c, 0x29, 0xea, 0xe2, 0x97, - 0x20, 0xad, 0x0f, 0xd0, 0xc8, 0x26, 0x58, 0xd3, 0xa5, 0xa5, 0x62, 0xbc, 0x94, 0xae, 0xff, 0xe4, - 0x72, 0x2a, 0x2f, 0xfc, 0x63, 0x2a, 0x3f, 0x70, 0x21, 0xc5, 0xc6, 0x79, 0xd9, 0x44, 0x95, 0x81, - 0x4e, 0xce, 0xca, 0x0d, 0x9b, 0xbc, 0x9e, 0xca, 0xc1, 0x8a, 0xab, 0xa9, 0x9c, 0xbd, 0xd0, 0x07, - 0x56, 0x55, 0xf1, 0x45, 0x8a, 0x9a, 0xe2, 0xe3, 0x5a, 0xd8, 0x79, 0x57, 0x4a, 0xdc, 0xd3, 0x79, - 0x77, 0xde, 0x79, 0x37, 0x70, 0x5e, 0x17, 0x7f, 0x00, 0x36, 0x88, 0xd9, 0x3b, 0xd7, 0x4c, 0xdb, - 0x80, 0x13, 0x88, 0x35, 0x5d, 0x23, 0x48, 0xeb, 0x4a, 0xc9, 0x62, 0xbc, 0x14, 0x57, 0xd7, 0xa8, - 0xaa, 0xe1, 0x6a, 0x6a, 0x1d, 0x54, 0x17, 0x45, 0xb0, 0x78, 0x0a, 0x21, 0x96, 0x52, 0xc5, 0x78, - 0x69, 0x51, 0x65, 0x63, 0xf1, 0x47, 0x20, 0x89, 0xdc, 0x6c, 0x4a, 0xe9, 0x62, 0xbc, 0xb4, 0xbc, - 0xf7, 0xb0, 0x1c, 0xaa, 0xd5, 0xf2, 0x6c, 0xc2, 0x55, 0xcf, 0xb6, 0x2a, 0xff, 0xe6, 0xd5, 0xb3, - 0x6d, 0x2f, 0x1d, 0xdf, 0xbc, 0x7a, 0xb6, 0x9d, 0xa1, 0xe5, 0x12, 0xe4, 0x4e, 0x39, 0x02, 0xab, - 0x47, 0xba, 0x69, 0x41, 0xc3, 0x4b, 0xa6, 0x0c, 0x96, 0x0d, 0x77, 0xa8, 0x99, 0xc6, 0x84, 0x25, - 0x74, 0x51, 0x05, 0x5c, 0xd4, 0x30, 0x26, 0xe2, 0x26, 0x58, 0x82, 0x8e, 0x83, 0xbc, 0x84, 0xba, - 0x13, 0xe5, 0x9f, 0x31, 0x20, 0x06, 0x6e, 0x55, 0x88, 0x87, 0xc8, 0xc6, 0x50, 0xfc, 0x35, 0x10, - 0x1d, 0x88, 0xa1, 0x33, 0x86, 0x4f, 0x34, 0xee, 0x03, 0x1a, 0x92, 0xc0, 0xe0, 0x3d, 0xbe, 0x0b, - 0xde, 0x6b, 0x96, 0x5e, 0x4d, 0xe5, 0x2d, 0x17, 0xe7, 0x79, 0x9d, 0xa2, 0xae, 0x7b, 0xc2, 0x03, - 0x4f, 0x16, 0x0a, 0x60, 0x37, 0x14, 0x40, 0xec, 0x7e, 0x01, 0xec, 0xde, 0x12, 0xc0, 0xee, 0x75, - 0x01, 0xec, 0x06, 0x01, 0xec, 0x83, 0xb5, 0x53, 0x06, 0xb0, 0x67, 0x87, 0xa5, 0x38, 0x4b, 0x60, - 0x7e, 0x26, 0x81, 0x33, 0x49, 0x50, 0x33, 0xa7, 0xe1, 0x29, 0x56, 0xfe, 0x16, 0x03, 0xab, 0x2d, - 0xdc, 0xff, 0x99, 0x49, 0xce, 0x0c, 0x47, 0xff, 0x4a, 0xb7, 0xbe, 0xb5, 0x9e, 0x1b, 0x83, 0x2c, - 0x3e, 0xd3, 0x1d, 0x88, 0x69, 0xc5, 0x3a, 0x70, 0x80, 0xc6, 0x90, 0xb7, 0x5e, 0xf3, 0x2e, 0xf4, - 0xe6, 0x16, 0x5e, 0x4d, 0xe5, 0x9c, 0x8b, 0x5d, 0x54, 0xa3, 0xa8, 0x19, 0x57, 0xd4, 0x41, 0x2a, - 0x13, 0xdc, 0xd4, 0x31, 0x89, 0xdb, 0x3b, 0x26, 0x19, 0x74, 0x4c, 0x55, 0x89, 0x96, 0xfe, 0x3a, - 0x2f, 0xfd, 0x00, 0x45, 0x25, 0x07, 0x1e, 0xcc, 0x08, 0xbc, 0xba, 0x55, 0xfe, 0xb2, 0xc4, 0xca, - 0xf9, 0xd8, 0xd2, 0x7b, 0xb0, 0x69, 0x0e, 0x4c, 0xd2, 0x76, 0x0c, 0xe8, 0xbc, 0x25, 0xea, 0x5b, - 0x20, 0xe5, 0x82, 0x6b, 0xda, 0x1c, 0x76, 0x17, 0xec, 0x86, 0x2d, 0x3e, 0x04, 0x69, 0x57, 0x85, - 0x46, 0x84, 0x23, 0xef, 0xda, 0xb6, 0x47, 0x44, 0xdc, 0x03, 0x9b, 0x01, 0x06, 0x9a, 0x69, 0x53, - 0x08, 0xa8, 0xdd, 0x52, 0x51, 0x28, 0xc5, 0xeb, 0x31, 0x49, 0x50, 0xb3, 0x3e, 0x10, 0x0d, 0xbb, - 0x83, 0xe8, 0x1a, 0x9f, 0xc6, 0xe8, 0x66, 0x49, 0xea, 0xf0, 0x8d, 0x69, 0x4c, 0x33, 0xed, 0x28, - 0x8d, 0x69, 0xa6, 0xed, 0xd3, 0x58, 0xc3, 0x16, 0xab, 0x00, 0x20, 0x8a, 0x83, 0x46, 0x2e, 0x86, - 0x50, 0x4a, 0x15, 0x85, 0x52, 0x26, 0xc2, 0x43, 0x01, 0x56, 0x9d, 0x8b, 0x21, 0x54, 0xd3, 0xc8, - 0x1b, 0x8a, 0x2d, 0xb0, 0x06, 0x27, 0x43, 0xd3, 0xd1, 0x29, 0x31, 0x69, 0xf4, 0x36, 0x93, 0xd2, - 0x45, 0x81, 0xf5, 0x81, 0x7b, 0xd5, 0x95, 0xbd, 0xab, 0xae, 0xdc, 0xf1, 0xae, 0xba, 0x7a, 0xea, - 0x72, 0x2a, 0x0b, 0x4f, 0xff, 0x2d, 0x0b, 0x6a, 0x26, 0x58, 0x4c, 0xd5, 0xa2, 0x0d, 0x32, 0x03, - 0x7d, 0xa2, 0xf1, 0x30, 0x29, 0x2a, 0x80, 0x1d, 0xf6, 0x13, 0xba, 0xe2, 0xb6, 0xc3, 0x46, 0x96, - 0x5d, 0x4d, 0xe5, 0x07, 0xee, 0x89, 0x67, 0xe5, 0x8a, 0xba, 0x32, 0xd0, 0x27, 0x35, 0x36, 0xa7, - 0xb8, 0xfe, 0x4e, 0x00, 0x59, 0x8b, 0x1e, 0x4e, 0xc3, 0xd0, 0xb2, 0xb4, 0xa1, 0x63, 0xf6, 0xa0, - 0xb4, 0xcc, 0xb6, 0x3c, 0xe7, 0x5b, 0x7e, 0xd8, 0x37, 0xc9, 0xd9, 0xa8, 0x5b, 0xee, 0xa1, 0x41, - 0x85, 0x63, 0xb2, 0x83, 0x9c, 0xbe, 0x37, 0xae, 0x8c, 0x3f, 0xac, 0x8c, 0x88, 0x69, 0x61, 0x37, - 0x9a, 0x63, 0x07, 0xf6, 0x0e, 0x60, 0x8f, 0xf6, 0x49, 0xd4, 0x6f, 0xd0, 0x27, 0x51, 0x8d, 0xa2, - 0x66, 0x98, 0xe8, 0x04, 0x5a, 0xd6, 0x31, 0x15, 0x54, 0x1f, 0x47, 0xab, 0xfc, 0x3d, 0x5e, 0xe5, - 0x91, 0xd2, 0x55, 0xfe, 0x15, 0x03, 0xf9, 0x79, 0xb1, 0x4f, 0xd4, 0x05, 0x00, 0x88, 0xa3, 0xdb, - 0xbd, 0x33, 0xf8, 0x29, 0xbc, 0xe0, 0xc5, 0x1d, 0x92, 0x88, 0x5f, 0x0b, 0x20, 0x49, 0x1f, 0x3a, - 0xb4, 0xac, 0x62, 0x2c, 0x6f, 0x5b, 0x65, 0xfe, 0x8c, 0xa1, 0x8f, 0xa1, 0x32, 0x7f, 0x0c, 0x95, - 0xf7, 0x91, 0x69, 0xfb, 0xd4, 0xf0, 0x38, 0x84, 0x08, 0x7f, 0x19, 0xb9, 0x3f, 0x3b, 0xd8, 0x38, - 0xaf, 0xd0, 0x22, 0xc2, 0x6c, 0xc1, 0xeb, 0xa9, 0xec, 0x39, 0xbf, 0x9a, 0xca, 0x19, 0xf7, 0xec, - 0x5c, 0xa0, 0xa8, 0x09, 0x3a, 0x6a, 0xd8, 0xe2, 0xef, 0x05, 0x90, 0x21, 0xfa, 0x39, 0x74, 0x34, - 0xa6, 0xa2, 0x39, 0x8f, 0xdf, 0x15, 0xc9, 0x17, 0xf7, 0x8f, 0x24, 0xb2, 0x47, 0x50, 0x20, 0xb3, - 0x72, 0x45, 0x5d, 0x61, 0x02, 0xba, 0xaa, 0x3d, 0x22, 0xca, 0x37, 0x02, 0x78, 0x18, 0xe2, 0x92, - 0x23, 0xd3, 0xb2, 0xa0, 0xf1, 0x46, 0xd4, 0x21, 0x83, 0x65, 0x0e, 0xb4, 0x76, 0x0e, 0x2f, 0x38, - 0x7b, 0x84, 0xb0, 0xaf, 0x3e, 0x89, 0xe6, 0x58, 0x8e, 0x30, 0x59, 0x74, 0x33, 0xe5, 0x7b, 0xe0, - 0xd1, 0x2d, 0x6a, 0x9f, 0xe5, 0x7e, 0x05, 0x36, 0x5a, 0xb8, 0xbf, 0xaf, 0xdb, 0x3d, 0x68, 0xbd, - 0x9b, 0x50, 0x4b, 0xd1, 0x50, 0x73, 0x3c, 0xd4, 0xe8, 0x26, 0xca, 0x77, 0x19, 0x5c, 0x51, 0xb1, - 0x1f, 0xda, 0x23, 0xb0, 0xda, 0x1a, 0x59, 0xc4, 0xfc, 0x04, 0x0d, 0x55, 0x34, 0x22, 0x90, 0x52, - 0xfc, 0x19, 0x1a, 0x62, 0xf7, 0xed, 0xa0, 0xb2, 0xb1, 0xf2, 0xe7, 0x38, 0x58, 0x6b, 0xe1, 0xbe, - 0x67, 0x78, 0x42, 0x1f, 0xb0, 0x6f, 0x47, 0xd1, 0x7b, 0x20, 0xe1, 0xd0, 0x6d, 0xae, 0xbf, 0x9c, - 0x67, 0x22, 0x51, 0xb9, 0xe5, 0x2c, 0xd5, 0x2e, 0xbe, 0x63, 0xaa, 0xa5, 0x7c, 0x03, 0x27, 0x26, - 0xd1, 0x5c, 0x0a, 0x70, 0xf9, 0x66, 0xc9, 0xe7, 0x9b, 0x85, 0xff, 0x87, 0x6f, 0xa2, 0x7e, 0x03, - 0xbe, 0x89, 0x6a, 0x14, 0xca, 0xbb, 0x26, 0x61, 0xf9, 0x61, 0x7c, 0x23, 0x7e, 0x00, 0xd6, 0x86, - 0xf4, 0x4e, 0xea, 0x42, 0x4c, 0x34, 0x06, 0x84, 0x94, 0x60, 0x1f, 0x08, 0xab, 0x54, 0x5c, 0x87, - 0x98, 0x30, 0x90, 0xaa, 0xef, 0x47, 0x0b, 0x61, 0x83, 0x17, 0x42, 0x38, 0x59, 0xca, 0x6f, 0x05, - 0x90, 0x8b, 0xc8, 0x7c, 0x46, 0xfa, 0x25, 0x48, 0xf9, 0x7d, 0x2e, 0xdc, 0xd5, 0xe7, 0x3f, 0xbe, - 0x7f, 0x9f, 0xfb, 0xde, 0x55, 0xc6, 0x3d, 0xb4, 0x87, 0xff, 0x28, 0xb0, 0x7a, 0xfa, 0x7c, 0x68, - 0xe8, 0x04, 0x1e, 0xb3, 0x6f, 0x2a, 0xf1, 0x23, 0x90, 0xd6, 0x47, 0xe4, 0x0c, 0x39, 0x26, 0xe1, - 0xbc, 0x58, 0x97, 0xfe, 0xfa, 0xa7, 0x9d, 0x4d, 0x1e, 0x4a, 0xcd, 0x30, 0x1c, 0x88, 0xf1, 0x09, - 0x71, 0x4c, 0xbb, 0xaf, 0x06, 0xa6, 0xe2, 0x47, 0x20, 0xe1, 0x7e, 0x95, 0x71, 0xba, 0xdc, 0x98, - 0xa9, 0x28, 0xd7, 0x79, 0x3d, 0x4d, 0xc3, 0xfe, 0xc3, 0xab, 0x67, 0xdb, 0x82, 0xca, 0xad, 0xab, - 0x1f, 0x50, 0xe0, 0x02, 0x3f, 0x61, 0xe8, 0xc2, 0x71, 0x29, 0x5b, 0x0c, 0xb9, 0xb0, 0xc8, 0x43, - 0x6e, 0x7b, 0x02, 0x32, 0xb3, 0xf7, 0xb0, 0xf8, 0x1e, 0x10, 0x3f, 0x6e, 0xb7, 0x0f, 0xb4, 0x4e, - 0xa3, 0xa9, 0xed, 0xd7, 0x3e, 0xdb, 0x3f, 0x6c, 0x36, 0x0f, 0x0f, 0xb2, 0x0b, 0x62, 0x16, 0xac, - 0x1c, 0x35, 0x9a, 0x4d, 0xad, 0xad, 0x6a, 0x9f, 0x36, 0x9a, 0xcd, 0xac, 0x20, 0xe6, 0xc0, 0x46, - 0xa3, 0xd5, 0x3a, 0x3c, 0x68, 0xd4, 0x3a, 0x87, 0x54, 0xec, 0x5a, 0x67, 0x63, 0xd4, 0xf4, 0xa7, - 0x9f, 0x9f, 0x74, 0xb4, 0xc6, 0x67, 0x5a, 0xa7, 0xd1, 0x3a, 0xcc, 0xc6, 0xc5, 0x75, 0xb0, 0xea, - 0x3b, 0x65, 0xa2, 0xc5, 0xbd, 0xff, 0x2e, 0x82, 0x78, 0x0b, 0xf7, 0xc5, 0x7d, 0x90, 0xf4, 0xbe, - 0x27, 0x72, 0xb3, 0x9d, 0xe4, 0x7f, 0x22, 0xe4, 0xe5, 0x1b, 0x14, 0x7e, 0x01, 0x34, 0x01, 0x08, - 0x3d, 0x78, 0xf3, 0x51, 0xf3, 0x40, 0x97, 0x57, 0x6e, 0xd6, 0xf9, 0xde, 0xbe, 0x04, 0x6b, 0xd1, - 0xd7, 0xdc, 0x5c, 0x04, 0x11, 0x83, 0xfc, 0xe3, 0x3b, 0x0c, 0x7c, 0xe7, 0x63, 0x20, 0xdd, 0x48, - 0xfc, 0xa5, 0x9b, 0x82, 0x8b, 0x5a, 0xe6, 0x9f, 0xbc, 0xa9, 0xa5, 0xbf, 0xef, 0xcf, 0x41, 0x76, - 0x8e, 0xbd, 0x8b, 0x51, 0x2f, 0x51, 0x8b, 0x7c, 0xe9, 0x2e, 0x0b, 0xdf, 0xbf, 0x0a, 0x56, 0x66, - 0xc8, 0xf5, 0x3b, 0xd1, 0x95, 0x61, 0x6d, 0xfe, 0xfd, 0xdb, 0xb4, 0x61, 0x9f, 0x33, 0x0d, 0x36, - 0xe7, 0x33, 0xac, 0x9d, 0xf7, 0x79, 0x5d, 0xc5, 0xe7, 0x97, 0xbe, 0xa6, 0x3d, 0x54, 0xff, 0xf8, - 0xf2, 0x45, 0x41, 0x78, 0xfe, 0xa2, 0x20, 0xfc, 0xe7, 0x45, 0x41, 0x78, 0xfa, 0xb2, 0xb0, 0xf0, - 0xfc, 0x65, 0x61, 0xe1, 0xef, 0x2f, 0x0b, 0x0b, 0x5f, 0xec, 0xdc, 0xcd, 0x95, 0x13, 0xf7, 0x5f, - 0x41, 0x94, 0x22, 0xba, 0x09, 0xf6, 0x16, 0xfd, 0xe1, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2a, - 0x07, 0x8e, 0x98, 0x26, 0x12, 0x00, 0x00, + // 1896 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcb, 0x6f, 0x23, 0x49, + 0x19, 0x4f, 0xdb, 0x4e, 0x62, 0x57, 0x12, 0xc7, 0xd3, 0xc9, 0x6c, 0x3a, 0x1e, 0x94, 0xb6, 0x7a, + 0x56, 0x3b, 0x66, 0xc4, 0xd8, 0xe3, 0x81, 0xdd, 0x43, 0x0e, 0x48, 0x71, 0x1e, 0xbb, 0x66, 0xed, + 0x49, 0xd4, 0xe3, 0x15, 0x68, 0x57, 0xa2, 0x69, 0xbb, 0x2b, 0x4e, 0x2b, 0xdd, 0x5d, 0x56, 0x57, + 0x39, 0xe3, 0x70, 0x61, 0x85, 0x38, 0xed, 0x69, 0x2f, 0x08, 0x24, 0xfe, 0x01, 0xb8, 0xcd, 0x61, + 0xcf, 0x9c, 0x87, 0x13, 0x2b, 0x24, 0x24, 0xe0, 0x60, 0x60, 0xe6, 0x30, 0xd2, 0x1e, 0x73, 0x80, + 0x0b, 0x07, 0x54, 0x8f, 0x7e, 0x3a, 0x8f, 0xc9, 0x92, 0x41, 0x1c, 0xb8, 0x4c, 0xaa, 0x7e, 0xdf, + 0x57, 0x5f, 0xfd, 0xaa, 0xbe, 0x57, 0xb9, 0x07, 0xac, 0x7a, 0x70, 0x44, 0x7c, 0xe4, 0xd5, 0x2d, + 0x38, 0xae, 0x93, 0x71, 0x6d, 0xe8, 0x23, 0x82, 0xe4, 0x05, 0x81, 0xd6, 0x2c, 0x38, 0x2e, 0xdf, + 0x32, 0x5d, 0xdb, 0x43, 0x75, 0xf6, 0x2f, 0x97, 0x97, 0x37, 0xfa, 0x08, 0xbb, 0x08, 0xd7, 0x7b, + 0x26, 0x86, 0xf5, 0x93, 0x46, 0x0f, 0x12, 0xb3, 0x51, 0xef, 0x23, 0xdb, 0x13, 0xf2, 0x35, 0x21, + 0x77, 0xf1, 0xa0, 0x7e, 0xd2, 0xa0, 0x7f, 0x84, 0x60, 0x9d, 0x0b, 0x0c, 0x36, 0xab, 0xf3, 0x89, + 0x10, 0xad, 0x0e, 0xd0, 0x00, 0x71, 0x9c, 0x8e, 0x04, 0xaa, 0x0e, 0x10, 0x1a, 0x38, 0xb0, 0xce, + 0x66, 0xbd, 0xd1, 0x61, 0x9d, 0xd8, 0x2e, 0xc4, 0xc4, 0x74, 0x87, 0x42, 0x41, 0x89, 0x1f, 0x60, + 0x68, 0xfa, 0xa6, 0x2b, 0x0c, 0x6a, 0x3f, 0x02, 0xc5, 0x1d, 0x38, 0x44, 0xd8, 0x26, 0xfb, 0x43, + 0x62, 0x23, 0x0f, 0xcb, 0xdf, 0x04, 0x25, 0xcb, 0xc6, 0x66, 0xcf, 0x81, 0x86, 0x39, 0x22, 0x08, + 0x3f, 0x35, 0x87, 0x8a, 0x54, 0x91, 0xaa, 0x79, 0x7d, 0x59, 0xe0, 0x5b, 0x02, 0x96, 0xef, 0x82, + 0xe2, 0xa1, 0x69, 0x3b, 0x06, 0x19, 0x1b, 0xc8, 0x33, 0x7a, 0xd0, 0x51, 0x32, 0x4c, 0x71, 0x81, + 0xa2, 0xdd, 0xf1, 0xbe, 0xd7, 0x84, 0x8e, 0xf6, 0x3c, 0x0b, 0x40, 0x07, 0x0f, 0xc4, 0x2e, 0xb2, + 0x02, 0xe6, 0xfb, 0x3e, 0x34, 0x09, 0xf2, 0x99, 0xd5, 0x82, 0x1e, 0x4c, 0xe5, 0x32, 0xc8, 0xfb, + 0xb0, 0x0f, 0xed, 0x13, 0xe8, 0x33, 0x3b, 0x05, 0x3d, 0x9c, 0xcb, 0x6b, 0x60, 0x9e, 0xa0, 0x63, + 0xe8, 0x19, 0xa6, 0x92, 0x65, 0xa2, 0x39, 0x36, 0xdd, 0x8a, 0x04, 0x3d, 0x25, 0x17, 0x13, 0x34, + 0xe5, 0x4f, 0x40, 0xc1, 0x74, 0xd1, 0xc8, 0x23, 0xd8, 0x30, 0x95, 0xd9, 0x4a, 0xb6, 0x5a, 0x68, + 0x7e, 0xf7, 0xf9, 0x44, 0x9d, 0xf9, 0xcb, 0x44, 0xbd, 0xcd, 0xaf, 0x14, 0x5b, 0xc7, 0x35, 0x1b, + 0xd5, 0x5d, 0x93, 0x1c, 0xd5, 0x5a, 0x1e, 0xf9, 0x6a, 0xa2, 0x46, 0x2b, 0xce, 0x26, 0x6a, 0xe9, + 0xd4, 0x74, 0x9d, 0x4d, 0x2d, 0x84, 0x34, 0x3d, 0x2f, 0xc6, 0x5b, 0x71, 0xe3, 0x3d, 0x65, 0xee, + 0x9a, 0xc6, 0x7b, 0xd3, 0xc6, 0x7b, 0x91, 0xf1, 0xa6, 0xfc, 0x2d, 0xb0, 0x42, 0xec, 0xfe, 0xb1, + 0x61, 0x7b, 0x16, 0x1c, 0x43, 0x6c, 0x98, 0x06, 0x41, 0x46, 0x4f, 0x99, 0xaf, 0x64, 0xab, 0x59, + 0x7d, 0x99, 0x8a, 0x5a, 0x5c, 0xb2, 0xd5, 0x45, 0x4d, 0x59, 0x06, 0xb9, 0x43, 0x08, 0xb1, 0x92, + 0xaf, 0x64, 0xab, 0x39, 0x9d, 0x8d, 0xe5, 0x77, 0xc1, 0x3c, 0xe2, 0xde, 0x54, 0x0a, 0x95, 0x6c, + 0x75, 0xe1, 0xd1, 0x9d, 0x5a, 0x2c, 0x56, 0x6b, 0x49, 0x87, 0xeb, 0x81, 0xee, 0xa6, 0xfa, 0xd3, + 0x57, 0xcf, 0xee, 0x07, 0xee, 0xf8, 0xec, 0xd5, 0xb3, 0xfb, 0x45, 0x1a, 0x2e, 0x91, 0xef, 0xb4, + 0x3d, 0xb0, 0xb4, 0x67, 0xda, 0x0e, 0xb4, 0x02, 0x67, 0xaa, 0x60, 0xc1, 0xe2, 0x43, 0xc3, 0xb6, + 0xc6, 0xcc, 0xa1, 0x39, 0x1d, 0x08, 0xa8, 0x65, 0x8d, 0xe5, 0x55, 0x30, 0x0b, 0x7d, 0x1f, 0x05, + 0x0e, 0xe5, 0x13, 0xed, 0x1f, 0x59, 0x20, 0x47, 0x66, 0x75, 0x88, 0x87, 0xc8, 0xc3, 0x50, 0xfe, + 0x09, 0x90, 0x7d, 0x88, 0xa1, 0x7f, 0x02, 0x1f, 0x1a, 0xc2, 0x06, 0xb4, 0x14, 0x89, 0x5d, 0xef, + 0xc1, 0x55, 0xd7, 0x7b, 0xce, 0xd2, 0xb3, 0x89, 0xba, 0xce, 0xef, 0x79, 0x5a, 0xa6, 0xe9, 0xb7, + 0x02, 0x70, 0x27, 0xc0, 0x62, 0x04, 0x1a, 0x31, 0x02, 0x99, 0xeb, 0x11, 0x68, 0x5c, 0x42, 0xa0, + 0x71, 0x1e, 0x81, 0x46, 0x44, 0x60, 0x1b, 0x2c, 0x1f, 0xb2, 0x0b, 0x0e, 0xf4, 0xb0, 0x92, 0x65, + 0x0e, 0x2c, 0x27, 0x1c, 0x98, 0x70, 0x82, 0x5e, 0x3c, 0x8c, 0x4f, 0xb1, 0xfc, 0x4b, 0x09, 0x2c, + 0xe1, 0x23, 0xd3, 0x87, 0xd8, 0xb0, 0x31, 0x1e, 0x41, 0x4b, 0xc9, 0x31, 0x1b, 0xeb, 0x35, 0x51, + 0x4a, 0x68, 0x41, 0xaa, 0x89, 0x82, 0x54, 0xdb, 0x46, 0xb6, 0xd7, 0xfc, 0x81, 0x38, 0xdc, 0xbd, + 0x81, 0x4d, 0x8e, 0x46, 0xbd, 0x5a, 0x1f, 0xb9, 0xa2, 0xee, 0x88, 0x3f, 0x0f, 0xb0, 0x75, 0x5c, + 0x27, 0xa7, 0x43, 0x88, 0xd9, 0x82, 0xaf, 0x26, 0x6a, 0x72, 0x8b, 0xb3, 0x89, 0xba, 0xca, 0x4f, + 0x9a, 0x80, 0x35, 0x7d, 0x91, 0xcf, 0x5b, 0x7c, 0xfa, 0xc7, 0x0c, 0x58, 0xea, 0xe0, 0xc1, 0xf7, + 0x6d, 0x72, 0x64, 0xf9, 0xe6, 0x53, 0xd3, 0xf9, 0xaf, 0x95, 0x83, 0x13, 0x50, 0x12, 0xcc, 0x08, + 0x32, 0x7c, 0xe8, 0xa2, 0x13, 0x28, 0xaa, 0x42, 0xfb, 0x2a, 0xc7, 0x4e, 0x2d, 0x3c, 0x9b, 0xa8, + 0x6b, 0x89, 0xc3, 0x86, 0x12, 0x4d, 0x2f, 0x72, 0xa8, 0x8b, 0x74, 0x06, 0x5c, 0x94, 0xcc, 0x73, + 0x97, 0x27, 0xf3, 0x7c, 0x94, 0xcc, 0x9b, 0x5a, 0x3a, 0x2b, 0x6f, 0x89, 0xac, 0x8c, 0x6e, 0x51, + 0xfb, 0x22, 0x0b, 0x6e, 0x27, 0x90, 0x73, 0x73, 0xea, 0xa9, 0x10, 0x7b, 0xfc, 0xaa, 0xaf, 0x93, + 0x53, 0xe1, 0xd2, 0x73, 0x72, 0x2a, 0x94, 0xc5, 0x72, 0x2a, 0x60, 0xe2, 0x25, 0x72, 0x2a, 0x22, + 0x90, 0xb9, 0x1e, 0x81, 0xc6, 0x25, 0x04, 0x1a, 0xe7, 0x11, 0x68, 0x44, 0x04, 0x62, 0xe9, 0xd0, + 0x1b, 0xf9, 0x1e, 0xb4, 0x44, 0x4a, 0xbd, 0x99, 0x74, 0xe0, 0x5b, 0x4c, 0xa5, 0x03, 0x87, 0xc3, + 0x74, 0x68, 0xf2, 0xe9, 0xef, 0x67, 0x59, 0x1d, 0x3c, 0x70, 0xcc, 0x3e, 0x6c, 0xdb, 0xae, 0x4d, + 0xf6, 0x7d, 0x0b, 0xfa, 0x5f, 0x33, 0x27, 0xd6, 0x41, 0x9e, 0x87, 0xbe, 0xed, 0x89, 0xa4, 0xe0, + 0xa9, 0xd0, 0xf2, 0xe4, 0x3b, 0xa0, 0xc0, 0x45, 0x68, 0x44, 0x44, 0x5e, 0x70, 0xdd, 0xfd, 0x11, + 0x91, 0x1f, 0x81, 0xd5, 0x28, 0x42, 0x0d, 0xdb, 0xa3, 0x01, 0x4a, 0xf5, 0x66, 0x2b, 0x52, 0x35, + 0xdb, 0xcc, 0x28, 0x92, 0x5e, 0x0a, 0xc3, 0xb4, 0xe5, 0x75, 0x11, 0x5d, 0x13, 0xf6, 0x3f, 0xba, + 0xd9, 0x3c, 0xf3, 0xe5, 0xeb, 0xf6, 0x3f, 0xc3, 0xf6, 0xd2, 0xfd, 0xcf, 0xb0, 0xbd, 0xb0, 0xff, + 0xb5, 0x3c, 0x79, 0x13, 0x00, 0x44, 0xef, 0xc1, 0xa0, 0x17, 0xac, 0xe4, 0x2b, 0x52, 0xb5, 0x98, + 0x6a, 0x60, 0xd1, 0x5d, 0x75, 0x4f, 0x87, 0x50, 0x2f, 0xa0, 0x60, 0x28, 0x77, 0xc0, 0x32, 0x1c, + 0x0f, 0x6d, 0xdf, 0xa4, 0x1d, 0xcd, 0xa0, 0xcf, 0x20, 0xa5, 0x50, 0x91, 0x58, 0x01, 0xe5, 0x6f, + 0xa4, 0x5a, 0xf0, 0x46, 0xaa, 0x75, 0x83, 0x37, 0x52, 0x33, 0xff, 0x7c, 0xa2, 0x4a, 0x9f, 0xff, + 0x55, 0x95, 0xf4, 0x62, 0xb4, 0x98, 0x8a, 0x65, 0x0f, 0x14, 0x5d, 0x73, 0x6c, 0x08, 0x9a, 0xf4, + 0x56, 0x00, 0x3b, 0xec, 0x07, 0x74, 0xc5, 0x65, 0x87, 0x4d, 0x2d, 0x3b, 0x9b, 0xa8, 0xb7, 0xf9, + 0x89, 0x93, 0xb8, 0xa6, 0x2f, 0xba, 0xe6, 0x78, 0x8b, 0xcd, 0xe9, 0xbd, 0xfe, 0x5c, 0x02, 0x25, + 0x87, 0x1e, 0xce, 0xc0, 0xd0, 0x71, 0x8c, 0xa1, 0x6f, 0xf7, 0xa1, 0xb2, 0xc0, 0xb6, 0x3c, 0x16, + 0x5b, 0x7e, 0x27, 0x16, 0x93, 0xe2, 0x4e, 0x1e, 0x20, 0x7f, 0x10, 0x8c, 0xeb, 0x27, 0xef, 0xd6, + 0x47, 0xc4, 0x76, 0x30, 0x67, 0x73, 0xe0, 0xc3, 0xfe, 0x0e, 0xec, 0xd3, 0x2a, 0x96, 0xb6, 0x1b, + 0x55, 0xb1, 0xb4, 0x44, 0xd3, 0x8b, 0x0c, 0x7a, 0x02, 0x1d, 0xe7, 0x80, 0x02, 0x9b, 0xf7, 0xd2, + 0x35, 0xe8, 0x2d, 0x51, 0x83, 0x52, 0xa1, 0xab, 0xfd, 0x33, 0x0b, 0xca, 0xd3, 0x70, 0x58, 0x8d, + 0x36, 0x00, 0x20, 0xbe, 0xe9, 0xf5, 0x8f, 0xe0, 0x87, 0xf0, 0x54, 0x04, 0x77, 0x0c, 0x91, 0x3f, + 0x95, 0xc0, 0x3c, 0x7d, 0x21, 0xd3, 0xb0, 0xca, 0x30, 0xbf, 0x5d, 0x92, 0xa5, 0xed, 0xeb, 0x67, + 0x69, 0x60, 0xfc, 0x6c, 0xa2, 0x16, 0xf9, 0xd9, 0x05, 0xa0, 0xe9, 0x73, 0x74, 0xd4, 0xf2, 0xe4, + 0x5f, 0x49, 0xa0, 0x48, 0xcc, 0x63, 0xe8, 0x1b, 0x4c, 0x44, 0x7d, 0x9e, 0xbd, 0x8a, 0xc9, 0xc7, + 0xd7, 0x67, 0x92, 0xda, 0x23, 0x0a, 0x90, 0x24, 0xae, 0xe9, 0x8b, 0x0c, 0xa0, 0xab, 0x68, 0x80, + 0xfc, 0x42, 0x02, 0x4b, 0x31, 0x0d, 0xdb, 0x63, 0xe9, 0x7c, 0xe3, 0xc5, 0x2c, 0xb1, 0x45, 0x54, + 0xcc, 0x12, 0xb0, 0xa6, 0x2f, 0x84, 0xd4, 0x5a, 0x9e, 0xf6, 0x99, 0x04, 0xee, 0xc4, 0x5a, 0xd0, + 0x9e, 0xed, 0x38, 0xd0, 0x7a, 0xad, 0xa2, 0xa6, 0x82, 0x05, 0x11, 0x02, 0xc6, 0x31, 0x3c, 0x15, + 0x75, 0x2d, 0x16, 0x15, 0x9b, 0x0f, 0xd3, 0xd1, 0xa7, 0xa6, 0x3a, 0x60, 0x7a, 0x33, 0xed, 0xef, + 0x19, 0x70, 0xf7, 0x12, 0x79, 0x18, 0x8f, 0xe7, 0x38, 0x5b, 0xfa, 0xdf, 0x71, 0x36, 0x65, 0xe7, + 0x26, 0xd9, 0x65, 0xde, 0x04, 0x3b, 0xf7, 0x02, 0x76, 0x6e, 0x9a, 0x9d, 0x1b, 0x63, 0xa7, 0xfd, + 0x18, 0xac, 0x74, 0xf0, 0x60, 0xdb, 0xf4, 0xfa, 0xd0, 0xb9, 0x19, 0x3f, 0x57, 0xd3, 0x7e, 0x5e, + 0x13, 0x7e, 0x4e, 0x6f, 0xa2, 0xfd, 0x39, 0xc3, 0x82, 0x2d, 0x8d, 0xff, 0xdf, 0xaf, 0x37, 0xe0, + 0xd7, 0xbb, 0x60, 0xa9, 0x33, 0x72, 0x88, 0xfd, 0x01, 0x1a, 0xea, 0x68, 0x44, 0x20, 0x7d, 0x94, + 0x1e, 0xa1, 0x21, 0xe6, 0x3f, 0xc4, 0x74, 0x36, 0xd6, 0x7e, 0x9b, 0x05, 0xcb, 0x1d, 0x3c, 0x08, + 0x14, 0x9f, 0x3c, 0x35, 0x87, 0x5f, 0xf3, 0xd9, 0xf2, 0x08, 0xcc, 0xf9, 0x74, 0x9b, 0xf3, 0x7f, + 0xe9, 0x24, 0x98, 0xe8, 0x42, 0x33, 0xf9, 0xfc, 0xc8, 0xdd, 0xf0, 0xf3, 0x83, 0xf6, 0x60, 0x38, + 0xb6, 0x89, 0xc1, 0xdb, 0x22, 0xef, 0xc1, 0xb3, 0x61, 0x0f, 0x9e, 0xf9, 0x4f, 0x7a, 0x70, 0xda, + 0x6e, 0xd4, 0x83, 0xd3, 0x12, 0x8d, 0xbe, 0x45, 0x6c, 0xc2, 0x62, 0x9b, 0xf5, 0x60, 0xf9, 0x1d, + 0xb0, 0x3c, 0xa4, 0xef, 0xb4, 0x1e, 0xc4, 0xc4, 0x60, 0x17, 0xa1, 0xcc, 0xb1, 0xaf, 0x2d, 0x4b, + 0x14, 0x6e, 0x42, 0x4c, 0xd8, 0x25, 0x6d, 0xbe, 0x9d, 0xce, 0xa2, 0x15, 0x91, 0x45, 0x71, 0x67, + 0x69, 0xbf, 0xcb, 0x80, 0xb5, 0x14, 0x16, 0x66, 0xcf, 0xcf, 0x24, 0x90, 0x7f, 0xfd, 0xbc, 0x79, + 0x7c, 0xfd, 0xc8, 0xcc, 0xc7, 0x62, 0x72, 0x39, 0xd6, 0x87, 0x59, 0x34, 0xb2, 0x1e, 0x4d, 0xd3, + 0xe4, 0x21, 0x98, 0xe5, 0xc7, 0xcc, 0x88, 0x17, 0xdc, 0xc5, 0x81, 0xc1, 0x15, 0xe5, 0x11, 0xc8, + 0x59, 0x23, 0x4c, 0xae, 0x7e, 0xe0, 0xef, 0x5d, 0x9f, 0x33, 0xb3, 0x7c, 0x36, 0x51, 0x17, 0x38, + 0x5f, 0x3a, 0xd3, 0x74, 0x06, 0x6a, 0xbf, 0x91, 0x58, 0x32, 0x7c, 0x34, 0xb4, 0x4c, 0x02, 0x0f, + 0xd8, 0xd7, 0x35, 0xf9, 0x3d, 0x50, 0x30, 0x47, 0xe4, 0x08, 0xf9, 0x36, 0x11, 0x0f, 0x9d, 0xa6, + 0xf2, 0x87, 0x2f, 0x1e, 0xac, 0x0a, 0x4a, 0x5b, 0x96, 0xe5, 0x43, 0x8c, 0x9f, 0x10, 0xdf, 0xf6, + 0x06, 0x7a, 0xa4, 0x2a, 0xbf, 0x07, 0xe6, 0xf8, 0xf7, 0x39, 0x71, 0xea, 0x95, 0xc4, 0xa9, 0xb9, + 0xf1, 0x66, 0x81, 0xd2, 0xff, 0xf5, 0xab, 0x67, 0xf7, 0x25, 0x5d, 0x68, 0x6f, 0xbe, 0x43, 0xbd, + 0x1e, 0xd9, 0x89, 0xfb, 0x3d, 0xce, 0x4b, 0x5b, 0x67, 0x6e, 0x8f, 0x43, 0x81, 0xdb, 0xef, 0x8f, + 0x41, 0x31, 0xf9, 0xb0, 0x96, 0xdf, 0x02, 0xf2, 0xfb, 0xfb, 0xfb, 0x3b, 0x46, 0xb7, 0xd5, 0x36, + 0xb6, 0xb7, 0x1e, 0x6f, 0xef, 0xb6, 0xdb, 0xbb, 0x3b, 0xa5, 0x19, 0xb9, 0x04, 0x16, 0xf7, 0x5a, + 0xed, 0xb6, 0xb1, 0xaf, 0x1b, 0x1f, 0xb6, 0xda, 0xed, 0x92, 0x24, 0xaf, 0x81, 0x95, 0x56, 0xa7, + 0xb3, 0xbb, 0xd3, 0xda, 0xea, 0xee, 0x52, 0x98, 0x6b, 0x97, 0x32, 0x54, 0xf5, 0x7b, 0x1f, 0x3d, + 0xe9, 0x1a, 0xad, 0xc7, 0x46, 0xb7, 0xd5, 0xd9, 0x2d, 0x65, 0xe5, 0x5b, 0x60, 0x29, 0x34, 0xca, + 0xa0, 0xdc, 0xa3, 0x7f, 0xe5, 0x40, 0xb6, 0x83, 0x07, 0xf2, 0x36, 0x98, 0x0f, 0xbe, 0x2c, 0xad, + 0x25, 0xbd, 0x1d, 0x7e, 0x2c, 0x2a, 0xab, 0x17, 0x08, 0xc2, 0xe8, 0x6d, 0x03, 0x10, 0xfb, 0xbe, + 0x50, 0x4e, 0xab, 0x47, 0xb2, 0xb2, 0x76, 0xb1, 0x2c, 0xb4, 0xf6, 0x09, 0x58, 0x4e, 0xff, 0x3c, + 0x9b, 0x62, 0x90, 0x52, 0x28, 0xdf, 0xbb, 0x42, 0x21, 0x34, 0x7e, 0x02, 0x94, 0x0b, 0xdf, 0x4b, + 0xd5, 0x8b, 0xc8, 0xa5, 0x35, 0xcb, 0x0f, 0x5f, 0x57, 0x33, 0xdc, 0xf7, 0x87, 0xa0, 0x34, 0xd5, + 0xb7, 0x2b, 0x69, 0x2b, 0x69, 0x8d, 0x72, 0xf5, 0x2a, 0x8d, 0xd0, 0xbe, 0x0e, 0x16, 0x13, 0x9d, + 0xe1, 0x1b, 0xe9, 0x95, 0x71, 0x69, 0xf9, 0xed, 0xcb, 0xa4, 0x71, 0x9b, 0x89, 0x04, 0x9b, 0xb2, + 0x19, 0x97, 0x4e, 0xdb, 0x3c, 0x2f, 0xe2, 0xcb, 0xb3, 0x9f, 0xd2, 0x1c, 0x6a, 0xbe, 0xff, 0xfc, + 0xc5, 0x86, 0xf4, 0xe5, 0x8b, 0x0d, 0xe9, 0x6f, 0x2f, 0x36, 0xa4, 0xcf, 0x5f, 0x6e, 0xcc, 0x7c, + 0xf9, 0x72, 0x63, 0xe6, 0x4f, 0x2f, 0x37, 0x66, 0x3e, 0x7e, 0x70, 0x75, 0xa1, 0x1f, 0xf3, 0xff, + 0x14, 0xa0, 0xa5, 0xa2, 0x37, 0xc7, 0x7e, 0x5c, 0x7e, 0xfb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x05, 0x89, 0x03, 0x45, 0x30, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1667,6 +1703,20 @@ func (m *MsgDepositResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.SharesIssued) > 0 { + for iNdEx := len(m.SharesIssued) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.SharesIssued[iNdEx].Size() + i -= size + if _, err := m.SharesIssued[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + } if len(m.FailedDeposits) > 0 { for iNdEx := len(m.FailedDeposits) - 1; iNdEx >= 0; iNdEx-- { { @@ -1834,6 +1884,40 @@ func (m *MsgWithdrawalResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.SharesBurned) > 0 { + for iNdEx := len(m.SharesBurned) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.SharesBurned[iNdEx].Size() + i -= size + if _, err := m.SharesBurned[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + { + size := m.Reserve1Withdrawn.Size() + i -= size + if _, err := m.Reserve1Withdrawn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + { + size := m.Reserve0Withdrawn.Size() + i -= size + if _, err := m.Reserve0Withdrawn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -1962,6 +2046,16 @@ func (m *MsgPlaceLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l + { + size := m.TakerCoinIn.Size() + i -= size + if _, err := m.TakerCoinIn.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 { size := m.TakerCoinOut.Size() i -= size @@ -2049,6 +2143,26 @@ func (m *MsgWithdrawFilledLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) _ = i var l int _ = l + { + size := m.MakerCoinOut.Size() + i -= size + if _, err := m.MakerCoinOut.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + { + size := m.TakerCoinOut.Size() + i -= size + if _, err := m.TakerCoinOut.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2109,6 +2223,26 @@ func (m *MsgCancelLimitOrderResponse) MarshalToSizedBuffer(dAtA []byte) (int, er _ = i var l int _ = l + { + size := m.MakerCoinOut.Size() + i -= size + if _, err := m.MakerCoinOut.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + { + size := m.TakerCoinOut.Size() + i -= size + if _, err := m.TakerCoinOut.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -2245,6 +2379,32 @@ func (m *MsgMultiHopSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l + if len(m.Dust) > 0 { + for iNdEx := len(m.Dust) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Dust[iNdEx].Size() + i -= size + if _, err := m.Dust[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + } + if m.Route != nil { + { + size, err := m.Route.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } { size := m.CoinOut.Size() i -= size @@ -2444,6 +2604,12 @@ func (m *MsgDepositResponse) Size() (n int) { n += 1 + l + sovTx(uint64(l)) } } + if len(m.SharesIssued) > 0 { + for _, e := range m.SharesIssued { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } return n } @@ -2498,6 +2664,16 @@ func (m *MsgWithdrawalResponse) Size() (n int) { } var l int _ = l + l = m.Reserve0Withdrawn.Size() + n += 1 + l + sovTx(uint64(l)) + l = m.Reserve1Withdrawn.Size() + n += 1 + l + sovTx(uint64(l)) + if len(m.SharesBurned) > 0 { + for _, e := range m.SharesBurned { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } return n } @@ -2560,6 +2736,8 @@ func (m *MsgPlaceLimitOrderResponse) Size() (n int) { n += 1 + l + sovTx(uint64(l)) l = m.TakerCoinOut.Size() n += 1 + l + sovTx(uint64(l)) + l = m.TakerCoinIn.Size() + n += 1 + l + sovTx(uint64(l)) return n } @@ -2586,6 +2764,10 @@ func (m *MsgWithdrawFilledLimitOrderResponse) Size() (n int) { } var l int _ = l + l = m.TakerCoinOut.Size() + n += 1 + l + sovTx(uint64(l)) + l = m.MakerCoinOut.Size() + n += 1 + l + sovTx(uint64(l)) return n } @@ -2612,6 +2794,10 @@ func (m *MsgCancelLimitOrderResponse) Size() (n int) { } var l int _ = l + l = m.TakerCoinOut.Size() + n += 1 + l + sovTx(uint64(l)) + l = m.MakerCoinOut.Size() + n += 1 + l + sovTx(uint64(l)) return n } @@ -2668,6 +2854,16 @@ func (m *MsgMultiHopSwapResponse) Size() (n int) { _ = l l = m.CoinOut.Size() n += 1 + l + sovTx(uint64(l)) + if m.Route != nil { + l = m.Route.Size() + n += 1 + l + sovTx(uint64(l)) + } + if len(m.Dust) > 0 { + for _, e := range m.Dust { + l = e.Size() + n += 1 + l + sovTx(uint64(l)) + } + } return n } @@ -3463,6 +3659,40 @@ func (m *MsgDepositResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesIssued", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SharesIssued = append(m.SharesIssued, github_com_cosmos_cosmos_sdk_types.Coin{}) + if err := m.SharesIssued[len(m.SharesIssued)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -3879,6 +4109,108 @@ func (m *MsgWithdrawalResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: MsgWithdrawalResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Reserve0Withdrawn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Reserve0Withdrawn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Reserve1Withdrawn", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Reserve1Withdrawn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SharesBurned", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SharesBurned = append(m.SharesBurned, github_com_cosmos_cosmos_sdk_types.Coin{}) + if err := m.SharesBurned[len(m.SharesBurned)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -4231,7 +4563,7 @@ func (m *MsgPlaceLimitOrder) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_neutron_org_neutron_v4_utils_math.PrecDec + var v github_com_neutron_org_neutron_v5_utils_math.PrecDec m.LimitSellPrice = &v if err := m.LimitSellPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4385,6 +4717,39 @@ func (m *MsgPlaceLimitOrderResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TakerCoinIn", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TakerCoinIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -4549,6 +4914,72 @@ func (m *MsgWithdrawFilledLimitOrderResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: MsgWithdrawFilledLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TakerCoinOut", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TakerCoinOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MakerCoinOut", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.MakerCoinOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -4713,6 +5144,72 @@ func (m *MsgCancelLimitOrderResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: MsgCancelLimitOrderResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TakerCoinOut", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TakerCoinOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MakerCoinOut", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.MakerCoinOut.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -5114,6 +5611,76 @@ func (m *MsgMultiHopSwapResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Route", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Route == nil { + m.Route = &MultiHopRoute{} + } + if err := m.Route.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Dust", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Dust = append(m.Dust, github_com_cosmos_cosmos_sdk_types.Coin{}) + if err := m.Dust[len(m.Dust)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/x/dex/types/v2/params.pb.go b/x/dex/types/v2/params.pb.go index b6e4ad499..c40889fe5 100644 --- a/x/dex/types/v2/params.pb.go +++ b/x/dex/types/v2/params.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - github_com_neutron_org_neutron_v4_utils_math "github.com/neutron-org/neutron/v4/utils/math" + github_com_neutron_org_neutron_v5_utils_math "github.com/neutron-org/neutron/v5/utils/math" io "io" math "math" math_bits "math/bits" @@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params defines the parameters for the module. type Params struct { FeeTiers []uint64 `protobuf:"varint,1,rep,packed,name=fee_tiers,json=feeTiers,proto3" json:"fee_tiers,omitempty"` - MaxTrueTakerSpread github_com_neutron_org_neutron_v4_utils_math.PrecDec `protobuf:"bytes,2,opt,name=max_true_taker_spread,json=maxTrueTakerSpread,proto3,customtype=github.com/neutron-org/neutron/v4/utils/math.PrecDec" json:"max_true_taker_spread" yaml:"max_true_taker_spread"` + MaxTrueTakerSpread github_com_neutron_org_neutron_v5_utils_math.PrecDec `protobuf:"bytes,2,opt,name=max_true_taker_spread,json=maxTrueTakerSpread,proto3,customtype=github.com/neutron-org/neutron/v5/utils/math.PrecDec" json:"max_true_taker_spread" yaml:"max_true_taker_spread"` } func (m *Params) Reset() { *m = Params{} } @@ -87,14 +87,14 @@ var fileDescriptor_d05490f4c0ad856f = []byte{ 0x92, 0xc4, 0xec, 0xd4, 0xa2, 0xf8, 0xe2, 0x82, 0xa2, 0xd4, 0xc4, 0x14, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e, 0xa7, 0xd2, 0x13, 0xf7, 0xe4, 0x19, 0x6e, 0xdd, 0x93, 0x37, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, 0x40, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, - 0x2f, 0x33, 0xd1, 0x2f, 0x2d, 0xc9, 0xcc, 0x29, 0xd6, 0xcf, 0x4d, 0x2c, 0xc9, 0xd0, 0x0b, 0x28, + 0x2f, 0x33, 0xd5, 0x2f, 0x2d, 0xc9, 0xcc, 0x29, 0xd6, 0xcf, 0x4d, 0x2c, 0xc9, 0xd0, 0x0b, 0x28, 0x4a, 0x4d, 0x76, 0x49, 0x4d, 0x7e, 0x75, 0x4f, 0x1e, 0xbb, 0xe1, 0x9f, 0xee, 0xc9, 0xcb, 0x54, 0x26, 0xe6, 0xe6, 0x58, 0x29, 0x61, 0x95, 0x56, 0x0a, 0x12, 0xca, 0x4d, 0xac, 0x08, 0x29, 0x2a, 0x4d, 0x0d, 0x01, 0x89, 0x06, 0x83, 0x05, 0xad, 0x58, 0x66, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3a, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x03, 0xc2, 0x4e, 0xac, 0x00, 0x87, 0x68, 0x49, 0x65, 0x41, 0x6a, 0xb1, 0x7e, 0x99, 0x51, 0x12, 0x1b, 0x38, 0xac, 0x8c, 0x01, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x45, 0xe3, 0x59, 0xc8, 0x70, 0x01, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xda, 0xae, 0xd3, 0x9e, 0x70, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/dex/utils/math.go b/x/dex/utils/math.go index 1a369aab3..e87314e26 100644 --- a/x/dex/utils/math.go +++ b/x/dex/utils/math.go @@ -8,7 +8,7 @@ import ( sdkmath "cosmossdk.io/math" - math_utils "github.com/neutron-org/neutron/v4/utils/math" + math_utils "github.com/neutron-org/neutron/v5/utils/math" ) // Return the base value for price, 1.0001 diff --git a/x/dex/utils/math_test.go b/x/dex/utils/math_test.go index fa52da35c..1459c0a92 100644 --- a/x/dex/utils/math_test.go +++ b/x/dex/utils/math_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - math_utils "github.com/neutron-org/neutron/v4/utils/math" - "github.com/neutron-org/neutron/v4/x/dex/utils" + math_utils "github.com/neutron-org/neutron/v5/utils/math" + "github.com/neutron-org/neutron/v5/x/dex/utils" ) func TestParsePrecDecScientificNotation(t *testing.T) { diff --git a/x/dynamicfees/client/cli/query.go b/x/dynamicfees/client/cli/query.go index 26b8d120f..704b239a7 100644 --- a/x/dynamicfees/client/cli/query.go +++ b/x/dynamicfees/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/dynamicfees/client/cli/query_params.go b/x/dynamicfees/client/cli/query_params.go index 486ad500e..6b62cd713 100644 --- a/x/dynamicfees/client/cli/query_params.go +++ b/x/dynamicfees/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/dynamicfees/genesis.go b/x/dynamicfees/genesis.go index 12b1842b3..3fb802d35 100644 --- a/x/dynamicfees/genesis.go +++ b/x/dynamicfees/genesis.go @@ -3,8 +3,8 @@ package dynamicfees import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/dynamicfees/genesis_test.go b/x/dynamicfees/genesis_test.go index ae96b291e..f9098d3bc 100644 --- a/x/dynamicfees/genesis_test.go +++ b/x/dynamicfees/genesis_test.go @@ -6,15 +6,15 @@ import ( "cosmossdk.io/math" cosmostypes "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dynamicfees" + "github.com/neutron-org/neutron/v5/x/dynamicfees" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/testutil/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) func TestGenesis(t *testing.T) { diff --git a/x/dynamicfees/keeper/grpc_query.go b/x/dynamicfees/keeper/grpc_query.go index bad090d22..d077d01a6 100644 --- a/x/dynamicfees/keeper/grpc_query.go +++ b/x/dynamicfees/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/dynamicfees/keeper/grpc_query_params.go b/x/dynamicfees/keeper/grpc_query_params.go index af83c649c..a7f7e3336 100644 --- a/x/dynamicfees/keeper/grpc_query_params.go +++ b/x/dynamicfees/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/dynamicfees/keeper/grpc_query_params_test.go b/x/dynamicfees/keeper/grpc_query_params_test.go index eea6385d6..a8b119f1c 100644 --- a/x/dynamicfees/keeper/grpc_query_params_test.go +++ b/x/dynamicfees/keeper/grpc_query_params_test.go @@ -7,8 +7,8 @@ import ( cosmostypes "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/dynamicfees/keeper/keeper.go b/x/dynamicfees/keeper/keeper.go index 2488e1bd3..d46efba6f 100644 --- a/x/dynamicfees/keeper/keeper.go +++ b/x/dynamicfees/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) type ( diff --git a/x/dynamicfees/keeper/msg_server.go b/x/dynamicfees/keeper/msg_server.go index c126c1e3b..111c9500c 100644 --- a/x/dynamicfees/keeper/msg_server.go +++ b/x/dynamicfees/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) type msgServer struct { diff --git a/x/dynamicfees/keeper/msg_server_test.go b/x/dynamicfees/keeper/msg_server_test.go index b0cfa06da..303a149c9 100644 --- a/x/dynamicfees/keeper/msg_server_test.go +++ b/x/dynamicfees/keeper/msg_server_test.go @@ -9,8 +9,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) type KeeperTestSuite struct { diff --git a/x/dynamicfees/keeper/params.go b/x/dynamicfees/keeper/params.go index 0125c3d1a..c55d8bfad 100644 --- a/x/dynamicfees/keeper/params.go +++ b/x/dynamicfees/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) // GetParams get all parameters as types.Params diff --git a/x/dynamicfees/keeper/resolver.go b/x/dynamicfees/keeper/resolver.go index 44ecb326a..c4749c4df 100644 --- a/x/dynamicfees/keeper/resolver.go +++ b/x/dynamicfees/keeper/resolver.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types" - appparams "github.com/neutron-org/neutron/v4/app/params" + appparams "github.com/neutron-org/neutron/v5/app/params" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) var _ feemarkettypes.DenomResolver = Keeper{} diff --git a/x/dynamicfees/keeper/resolver_test.go b/x/dynamicfees/keeper/resolver_test.go index 274186dc2..305cfc6c4 100644 --- a/x/dynamicfees/keeper/resolver_test.go +++ b/x/dynamicfees/keeper/resolver_test.go @@ -7,10 +7,10 @@ import ( cosmostypes "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - appparams "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - testkeeper "github.com/neutron-org/neutron/v4/testutil/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + appparams "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + testkeeper "github.com/neutron-org/neutron/v5/testutil/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) func TestConvertToDenom(t *testing.T) { diff --git a/x/dynamicfees/module.go b/x/dynamicfees/module.go index 3af50b80e..c45eaf262 100644 --- a/x/dynamicfees/module.go +++ b/x/dynamicfees/module.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/dynamicfees/client/cli" - "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper" - "github.com/neutron-org/neutron/v4/x/dynamicfees/types" + "github.com/neutron-org/neutron/v5/x/dynamicfees/client/cli" + "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper" + "github.com/neutron-org/neutron/v5/x/dynamicfees/types" ) var ( diff --git a/x/dynamicfees/module_simulation.go b/x/dynamicfees/module_simulation.go index 46f121bca..9cf98aa1e 100644 --- a/x/dynamicfees/module_simulation.go +++ b/x/dynamicfees/module_simulation.go @@ -7,9 +7,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/neutron-org/neutron/v4/testutil/common/sample" - feeburnersimulation "github.com/neutron-org/neutron/v4/x/feeburner/simulation" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + feeburnersimulation "github.com/neutron-org/neutron/v5/x/feeburner/simulation" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) // avoid unused import issue diff --git a/x/dynamicfees/types/genesis.pb.go b/x/dynamicfees/types/genesis.pb.go index ff1c4b185..e1aec7191 100644 --- a/x/dynamicfees/types/genesis.pb.go +++ b/x/dynamicfees/types/genesis.pb.go @@ -89,8 +89,8 @@ var fileDescriptor_311447c521bf6ae9 = []byte{ 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xd3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x89, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, 0x7e, 0x99, - 0x89, 0x7e, 0x05, 0x8a, 0x43, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xae, 0x34, 0x06, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x44, 0xe2, 0x53, 0x49, 0x20, 0x01, 0x00, 0x00, + 0xa9, 0x7e, 0x05, 0x8a, 0x43, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xae, 0x34, 0x06, + 0x04, 0x00, 0x00, 0xff, 0xff, 0x60, 0x3b, 0x54, 0x2a, 0x20, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/dynamicfees/types/params.pb.go b/x/dynamicfees/types/params.pb.go index cd6c8940e..dab94c323 100644 --- a/x/dynamicfees/types/params.pb.go +++ b/x/dynamicfees/types/params.pb.go @@ -98,8 +98,8 @@ var fileDescriptor_f4ff446f82722ba2 = []byte{ 0x56, 0x2c, 0x33, 0x16, 0xc8, 0x33, 0x38, 0xf9, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x29, 0x92, 0xc1, 0x50, 0x7f, 0xeb, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, - 0x26, 0xfa, 0x15, 0x28, 0xa1, 0x05, 0xb6, 0x2b, 0x89, 0x0d, 0xec, 0x39, 0x63, 0x40, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x5d, 0x49, 0x6f, 0xb5, 0x51, 0x01, 0x00, 0x00, + 0xa6, 0xfa, 0x15, 0x28, 0xa1, 0x05, 0xb6, 0x2b, 0x89, 0x0d, 0xec, 0x39, 0x63, 0x40, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x79, 0x90, 0x68, 0xd6, 0x51, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/dynamicfees/types/query.pb.go b/x/dynamicfees/types/query.pb.go index 51fb31b92..d0de7e7a9 100644 --- a/x/dynamicfees/types/query.pb.go +++ b/x/dynamicfees/types/query.pb.go @@ -138,9 +138,9 @@ var fileDescriptor_372e8efc521c6d67 = []byte{ 0x25, 0xb5, 0xa6, 0xcb, 0x4f, 0x26, 0x33, 0x29, 0x08, 0xc9, 0xe9, 0xe3, 0x0d, 0x06, 0x27, 0xff, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, - 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x85, 0x99, 0xa1, 0x9b, 0x5f, 0x94, 0x0e, 0x37, 0xaf, 0xcc, 0x44, + 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x85, 0x99, 0xa1, 0x9b, 0x5f, 0x94, 0x0e, 0x37, 0xaf, 0xcc, 0x54, 0xbf, 0x02, 0xc5, 0xd0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xc0, 0x1a, 0x03, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xec, 0xfe, 0xa2, 0xfa, 0xef, 0x01, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xc8, 0x27, 0xa5, 0x99, 0xef, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/dynamicfees/types/tx.pb.go b/x/dynamicfees/types/tx.pb.go index a2dc42872..8639598bd 100644 --- a/x/dynamicfees/types/tx.pb.go +++ b/x/dynamicfees/types/tx.pb.go @@ -155,8 +155,8 @@ var fileDescriptor_a6a5f55503750f7f = []byte{ 0x40, 0x5e, 0x71, 0xf2, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xd3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0xd9, 0xba, 0xf9, 0x45, - 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0x89, 0x7e, 0x05, 0x4a, 0x64, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, - 0xb1, 0x81, 0x63, 0xca, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x32, 0x9c, 0x49, 0x80, 0x66, 0x02, + 0xe9, 0x30, 0xb6, 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0x4a, 0x64, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, + 0xb1, 0x81, 0x63, 0xca, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x16, 0x45, 0x4e, 0xe3, 0x66, 0x02, 0x00, 0x00, } diff --git a/x/feeburner/client/cli/query.go b/x/feeburner/client/cli/query.go index 9978f4e4c..6c5116049 100644 --- a/x/feeburner/client/cli/query.go +++ b/x/feeburner/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/feeburner/client/cli/query_params.go b/x/feeburner/client/cli/query_params.go index c906483fc..90238e64e 100644 --- a/x/feeburner/client/cli/query_params.go +++ b/x/feeburner/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/feeburner/client/cli/query_total_burned_neutrons_amount.go b/x/feeburner/client/cli/query_total_burned_neutrons_amount.go index 5529f38d3..3de28acf0 100644 --- a/x/feeburner/client/cli/query_total_burned_neutrons_amount.go +++ b/x/feeburner/client/cli/query_total_burned_neutrons_amount.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func CmdQueryTotalBurnedNeutronsAmount() *cobra.Command { diff --git a/x/feeburner/genesis.go b/x/feeburner/genesis.go index 2e698cf9d..50d184b77 100644 --- a/x/feeburner/genesis.go +++ b/x/feeburner/genesis.go @@ -3,8 +3,8 @@ package feeburner import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/feeburner/genesis_test.go b/x/feeburner/genesis_test.go index 4287929a5..78535b32a 100644 --- a/x/feeburner/genesis_test.go +++ b/x/feeburner/genesis_test.go @@ -5,15 +5,15 @@ import ( "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestGenesis(t *testing.T) { diff --git a/x/feeburner/keeper/grpc_query.go b/x/feeburner/keeper/grpc_query.go index a2d53508e..7158d411c 100644 --- a/x/feeburner/keeper/grpc_query.go +++ b/x/feeburner/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/feeburner/keeper/grpc_query_params.go b/x/feeburner/keeper/grpc_query_params.go index 7455573b3..955c9f2be 100644 --- a/x/feeburner/keeper/grpc_query_params.go +++ b/x/feeburner/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/feeburner/keeper/grpc_query_params_test.go b/x/feeburner/keeper/grpc_query_params_test.go index 030a8f022..135091f53 100644 --- a/x/feeburner/keeper/grpc_query_params_test.go +++ b/x/feeburner/keeper/grpc_query_params_test.go @@ -3,12 +3,12 @@ package keeper_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/feeburner/keeper/grpc_query_test.go b/x/feeburner/keeper/grpc_query_test.go index 32a1dc814..fa58019f5 100644 --- a/x/feeburner/keeper/grpc_query_test.go +++ b/x/feeburner/keeper/grpc_query_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - feekeeperutil "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + feekeeperutil "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestGrpcQuery_TotalBurnedNeutronsAmount(t *testing.T) { diff --git a/x/feeburner/keeper/keeper.go b/x/feeburner/keeper/keeper.go index 0eb798ce8..f2ff162b6 100644 --- a/x/feeburner/keeper/keeper.go +++ b/x/feeburner/keeper/keeper.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" consumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) type ( diff --git a/x/feeburner/keeper/keeper_test.go b/x/feeburner/keeper/keeper_test.go index 7898a8c5f..1a2422a49 100644 --- a/x/feeburner/keeper/keeper_test.go +++ b/x/feeburner/keeper/keeper_test.go @@ -12,11 +12,11 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/feeburner/types" - "github.com/neutron-org/neutron/v4/x/feeburner/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/keeper" - feekeeperutil "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - feetypes "github.com/neutron-org/neutron/v4/x/feeburner/types" + feekeeperutil "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + feetypes "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestKeeper_RecordBurnedFees(t *testing.T) { diff --git a/x/feeburner/keeper/msg_server.go b/x/feeburner/keeper/msg_server.go index ff783fb6c..c6aa92197 100644 --- a/x/feeburner/keeper/msg_server.go +++ b/x/feeburner/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) type msgServer struct { diff --git a/x/feeburner/keeper/msg_server_test.go b/x/feeburner/keeper/msg_server_test.go index bdb41fbf0..cff502714 100644 --- a/x/feeburner/keeper/msg_server_test.go +++ b/x/feeburner/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestMsgUpdateParamsValidate(t *testing.T) { diff --git a/x/feeburner/keeper/params.go b/x/feeburner/keeper/params.go index 966afdf21..9229eb2ca 100644 --- a/x/feeburner/keeper/params.go +++ b/x/feeburner/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) // GetParams get all parameters as types.Params diff --git a/x/feeburner/keeper/params_test.go b/x/feeburner/keeper/params_test.go index 19326fca6..8c360512b 100644 --- a/x/feeburner/keeper/params_test.go +++ b/x/feeburner/keeper/params_test.go @@ -3,12 +3,12 @@ package keeper_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestGetParams(t *testing.T) { diff --git a/x/feeburner/module.go b/x/feeburner/module.go index 212da36ab..d2381047c 100644 --- a/x/feeburner/module.go +++ b/x/feeburner/module.go @@ -20,9 +20,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/feeburner/client/cli" - "github.com/neutron-org/neutron/v4/x/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/x/feeburner/client/cli" + "github.com/neutron-org/neutron/v5/x/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) var ( diff --git a/x/feeburner/module_simulation.go b/x/feeburner/module_simulation.go index 73879f633..85d33e561 100644 --- a/x/feeburner/module_simulation.go +++ b/x/feeburner/module_simulation.go @@ -7,9 +7,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/neutron-org/neutron/v4/testutil/common/sample" - feeburnersimulation "github.com/neutron-org/neutron/v4/x/feeburner/simulation" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + feeburnersimulation "github.com/neutron-org/neutron/v5/x/feeburner/simulation" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) // avoid unused import issue diff --git a/x/feeburner/types/genesis.pb.go b/x/feeburner/types/genesis.pb.go index 817cad2ff..f9004204d 100644 --- a/x/feeburner/types/genesis.pb.go +++ b/x/feeburner/types/genesis.pb.go @@ -98,8 +98,8 @@ var fileDescriptor_bdeb93808577407e = []byte{ 0xf0, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xe3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x95, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, - 0x7e, 0x99, 0x89, 0x7e, 0x05, 0x72, 0x50, 0x55, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x03, 0xc5, - 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x52, 0xf6, 0xa7, 0x83, 0xb6, 0x01, 0x00, 0x00, + 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0x72, 0x50, 0x55, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x03, 0xc5, + 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x13, 0xed, 0x2b, 0xed, 0xb6, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/feeburner/types/genesis_test.go b/x/feeburner/types/genesis_test.go index 08bf48f70..e94b328ae 100644 --- a/x/feeburner/types/genesis_test.go +++ b/x/feeburner/types/genesis_test.go @@ -3,14 +3,14 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/feeburner/keeper" - "github.com/neutron-org/neutron/v4/x/feeburner" - "github.com/neutron-org/neutron/v4/x/feeburner/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/feeburner/keeper" + "github.com/neutron-org/neutron/v5/x/feeburner" + "github.com/neutron-org/neutron/v5/x/feeburner/types" ) func TestGenesis(t *testing.T) { diff --git a/x/feeburner/types/params.go b/x/feeburner/types/params.go index de99e75d2..42e43fd92 100644 --- a/x/feeburner/types/params.go +++ b/x/feeburner/types/params.go @@ -7,7 +7,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "gopkg.in/yaml.v2" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/feeburner/types/params.pb.go b/x/feeburner/types/params.pb.go index 2f539541e..941f74a91 100644 --- a/x/feeburner/types/params.pb.go +++ b/x/feeburner/types/params.pb.go @@ -107,9 +107,9 @@ var fileDescriptor_be38a6978544057e = []byte{ 0x4a, 0xad, 0x58, 0x66, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xe3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, - 0xa8, 0x63, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x32, 0x13, 0xfd, 0x0a, 0xa4, 0x80, 0x28, - 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0xfb, 0xcf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x07, - 0x94, 0x37, 0x42, 0x2a, 0x01, 0x00, 0x00, + 0xa8, 0x63, 0x74, 0xf3, 0x8b, 0xd2, 0x61, 0x6c, 0xfd, 0x32, 0x53, 0xfd, 0x0a, 0xa4, 0x80, 0x28, + 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0xfb, 0xcf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x46, + 0x8f, 0xbb, 0x2c, 0x2a, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/feeburner/types/query.pb.go b/x/feeburner/types/query.pb.go index ea85ae590..102eac6a0 100644 --- a/x/feeburner/types/query.pb.go +++ b/x/feeburner/types/query.pb.go @@ -210,32 +210,32 @@ func init() { proto.RegisterFile("neutron/feeburner/query.proto", fileDescriptor var fileDescriptor_f540485c4b79b2ac = []byte{ // 408 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x3f, 0x6f, 0xda, 0x40, - 0x18, 0xc6, 0x6d, 0xd4, 0x32, 0x5c, 0xa7, 0x5e, 0x19, 0x6a, 0x97, 0xba, 0xad, 0x25, 0x68, 0x55, - 0xb5, 0x3e, 0xf1, 0x47, 0xa2, 0x1d, 0xcb, 0x5e, 0xd4, 0xa2, 0x4e, 0x5d, 0xd0, 0x99, 0x5c, 0x1c, - 0x4b, 0xf8, 0x5e, 0xe3, 0x3b, 0xa3, 0x90, 0x31, 0x9f, 0x20, 0x52, 0xe6, 0x7c, 0x1f, 0x32, 0x05, - 0x29, 0x4b, 0xa6, 0x28, 0x82, 0x7c, 0x90, 0x88, 0xf3, 0x81, 0x12, 0x19, 0x07, 0x25, 0xdb, 0xf9, - 0x9e, 0xf7, 0x79, 0x9f, 0xdf, 0xfb, 0xfa, 0xd0, 0x7b, 0xce, 0x52, 0x99, 0x00, 0x27, 0xfb, 0x8c, - 0xf9, 0x69, 0xc2, 0x59, 0x42, 0xc6, 0x29, 0x4b, 0xa6, 0x5e, 0x9c, 0x80, 0x04, 0xfc, 0x5a, 0xcb, - 0xde, 0x46, 0xb6, 0xbf, 0x0e, 0x41, 0x44, 0x20, 0x88, 0x4f, 0x05, 0xcb, 0x6a, 0xc9, 0xa4, 0xe1, - 0x33, 0x49, 0x1b, 0x24, 0xa6, 0x41, 0xc8, 0xa9, 0x0c, 0x81, 0x67, 0x76, 0xbb, 0x12, 0x40, 0x00, - 0xea, 0x48, 0x56, 0x27, 0x7d, 0x5b, 0x0d, 0x00, 0x82, 0x11, 0x23, 0x34, 0x0e, 0x09, 0xe5, 0x1c, - 0xa4, 0xb2, 0x08, 0xad, 0x3a, 0x79, 0xa2, 0x98, 0x26, 0x34, 0x5a, 0xeb, 0xed, 0xbc, 0x2e, 0x41, - 0xd2, 0xd1, 0x40, 0x7d, 0xec, 0x0d, 0xb4, 0x2c, 0x06, 0x34, 0x82, 0x94, 0xcb, 0xcc, 0xe5, 0x56, - 0x10, 0xfe, 0xbb, 0x62, 0xfd, 0xa3, 0x5a, 0xf5, 0xd9, 0x38, 0x65, 0x42, 0xba, 0x3d, 0xf4, 0xe6, - 0xc1, 0xad, 0x88, 0x81, 0x0b, 0x86, 0x3b, 0xa8, 0x9c, 0x45, 0xbe, 0x35, 0x3f, 0x9a, 0x5f, 0x5e, - 0x35, 0x2d, 0x2f, 0xb7, 0x06, 0x2f, 0xb3, 0x74, 0x5f, 0xcc, 0xae, 0x3f, 0x18, 0x7d, 0x5d, 0xee, - 0x7e, 0x46, 0x35, 0xd5, 0xef, 0xdf, 0x0a, 0xa8, 0xab, 0x78, 0x7a, 0x1a, 0xe7, 0x97, 0xa2, 0x59, - 0x07, 0x9f, 0x99, 0xa8, 0xbe, 0xab, 0x52, 0xc3, 0x08, 0x54, 0x7d, 0x6c, 0x3e, 0x8d, 0xf8, 0x6d, - 0x0b, 0x62, 0x61, 0x6f, 0x4d, 0x6d, 0xc9, 0xa2, 0x82, 0xe6, 0x45, 0x09, 0xbd, 0x54, 0x7c, 0xf8, - 0x08, 0x95, 0xb3, 0x51, 0x71, 0x6d, 0x4b, 0x44, 0x7e, 0xa7, 0x76, 0x7d, 0x57, 0x59, 0x36, 0x97, - 0xfb, 0xe9, 0xf8, 0xf2, 0xf6, 0xb4, 0xf4, 0x0e, 0x5b, 0xa4, 0xe8, 0x87, 0xe3, 0x73, 0x13, 0x59, - 0x85, 0x43, 0xe0, 0x1f, 0x45, 0x41, 0xbb, 0xb6, 0x6f, 0xff, 0x7c, 0x86, 0x53, 0x53, 0x77, 0x14, - 0x75, 0x03, 0x13, 0xf2, 0xb4, 0x67, 0xd8, 0xfd, 0x3d, 0x5b, 0x38, 0xe6, 0x7c, 0xe1, 0x98, 0x37, - 0x0b, 0xc7, 0x3c, 0x59, 0x3a, 0xc6, 0x7c, 0xe9, 0x18, 0x57, 0x4b, 0xc7, 0xf8, 0xdf, 0x0a, 0x42, - 0x79, 0x90, 0xfa, 0xde, 0x10, 0xa2, 0x75, 0xd3, 0xef, 0x90, 0x04, 0x9b, 0x80, 0x49, 0x9b, 0x1c, - 0xde, 0x4f, 0x99, 0xc6, 0x4c, 0xf8, 0x65, 0xf5, 0xac, 0x5b, 0x77, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x2b, 0x5b, 0x8a, 0x3a, 0xc0, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x31, 0x6f, 0xda, 0x40, + 0x14, 0xc7, 0x6d, 0xd4, 0x32, 0x5c, 0xa7, 0x5e, 0x19, 0x6a, 0x97, 0xba, 0xad, 0x25, 0x68, 0x55, + 0xb5, 0x3e, 0x01, 0xad, 0x68, 0xc7, 0xb2, 0x17, 0xb5, 0x28, 0x53, 0x16, 0x74, 0x26, 0x17, 0xc7, + 0x12, 0xbe, 0x67, 0x7c, 0x67, 0x14, 0x32, 0xe6, 0x13, 0x44, 0xca, 0x9c, 0xef, 0x43, 0xa6, 0x20, + 0x65, 0xc9, 0x14, 0x45, 0x90, 0x0f, 0x12, 0x71, 0x3e, 0x50, 0x22, 0xe3, 0xa0, 0x64, 0x3b, 0xdf, + 0xff, 0xfd, 0xdf, 0xff, 0xf7, 0x9e, 0x0f, 0xbd, 0xe7, 0x2c, 0x95, 0x09, 0x70, 0xb2, 0xcf, 0x98, + 0x9f, 0x26, 0x9c, 0x25, 0x64, 0x94, 0xb2, 0x64, 0xe2, 0xc5, 0x09, 0x48, 0xc0, 0xaf, 0xb5, 0xec, + 0xad, 0x65, 0xfb, 0xeb, 0x00, 0x44, 0x04, 0x82, 0xf8, 0x54, 0xb0, 0xac, 0x96, 0x8c, 0x1b, 0x3e, + 0x93, 0xb4, 0x41, 0x62, 0x1a, 0x84, 0x9c, 0xca, 0x10, 0x78, 0x66, 0xb7, 0x2b, 0x01, 0x04, 0xa0, + 0x8e, 0x64, 0x79, 0xd2, 0xb7, 0xd5, 0x00, 0x20, 0x18, 0x32, 0x42, 0xe3, 0x90, 0x50, 0xce, 0x41, + 0x2a, 0x8b, 0xd0, 0xaa, 0x93, 0x27, 0x8a, 0x69, 0x42, 0xa3, 0x95, 0xfe, 0x23, 0xaf, 0x4b, 0x90, + 0x74, 0xd8, 0x57, 0x1f, 0x7b, 0x7d, 0x2d, 0x8b, 0x3e, 0x8d, 0x20, 0xe5, 0x32, 0x73, 0xb9, 0x15, + 0x84, 0xff, 0x2f, 0x59, 0xff, 0xa9, 0x56, 0x3d, 0x36, 0x4a, 0x99, 0x90, 0x6e, 0x17, 0xbd, 0x79, + 0x70, 0x2b, 0x62, 0xe0, 0x82, 0xe1, 0x36, 0x2a, 0x67, 0x91, 0x6f, 0xcd, 0x8f, 0xe6, 0x97, 0x57, + 0x4d, 0xcb, 0xcb, 0xad, 0xc1, 0xcb, 0x2c, 0x9d, 0x17, 0xd3, 0xeb, 0x0f, 0x46, 0x4f, 0x97, 0xbb, + 0x9f, 0x51, 0x4d, 0xf5, 0xdb, 0x59, 0x02, 0x75, 0x14, 0x4f, 0x57, 0xe3, 0xfc, 0x51, 0x34, 0xab, + 0xe0, 0x33, 0x13, 0xd5, 0xb7, 0x55, 0x6a, 0x18, 0x81, 0xaa, 0x8f, 0xcd, 0xa7, 0x11, 0xbf, 0x6d, + 0x40, 0x2c, 0xec, 0xad, 0xa9, 0x2d, 0x59, 0x54, 0xd0, 0xbc, 0x28, 0xa1, 0x97, 0x8a, 0x0f, 0x1f, + 0xa1, 0x72, 0x36, 0x2a, 0xae, 0x6d, 0x88, 0xc8, 0xef, 0xd4, 0xae, 0x6f, 0x2b, 0xcb, 0xe6, 0x72, + 0x3f, 0x1d, 0x5f, 0xde, 0x9e, 0x96, 0xde, 0x61, 0x8b, 0x14, 0xfd, 0x70, 0x7c, 0x6e, 0x22, 0xab, + 0x70, 0x08, 0xfc, 0xab, 0x28, 0x68, 0xdb, 0xf6, 0xed, 0xdf, 0xcf, 0x70, 0x6a, 0xea, 0xb6, 0xa2, + 0x6e, 0x60, 0x42, 0x9e, 0xf6, 0x0c, 0x3b, 0x7f, 0xa7, 0x73, 0xc7, 0x9c, 0xcd, 0x1d, 0xf3, 0x66, + 0xee, 0x98, 0x27, 0x0b, 0xc7, 0x98, 0x2d, 0x1c, 0xe3, 0x6a, 0xe1, 0x18, 0xbb, 0xad, 0x20, 0x94, + 0x07, 0xa9, 0xef, 0x0d, 0x20, 0x5a, 0x35, 0xfd, 0x0e, 0x49, 0xb0, 0x0e, 0x18, 0xff, 0x24, 0x87, + 0xf7, 0x53, 0x26, 0x31, 0x13, 0x7e, 0x59, 0x3d, 0xeb, 0xd6, 0x5d, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x6a, 0x40, 0x06, 0x54, 0xc0, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feeburner/types/total_burned_neutrons_amount.pb.go b/x/feeburner/types/total_burned_neutrons_amount.pb.go index 8e9acf9f1..c9edd009f 100644 --- a/x/feeburner/types/total_burned_neutrons_amount.pb.go +++ b/x/feeburner/types/total_burned_neutrons_amount.pb.go @@ -92,9 +92,9 @@ var fileDescriptor_dfe0eb8ae8e764c8 = []byte{ 0x62, 0x6e, 0x8e, 0x95, 0x12, 0x48, 0x93, 0x52, 0x10, 0x58, 0xaf, 0x93, 0xef, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, - 0xe7, 0xe7, 0xea, 0x43, 0xbd, 0xa3, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xe8, 0x57, + 0xe7, 0xe7, 0xea, 0x43, 0xbd, 0xa3, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x20, 0x87, 0x4a, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xd9, 0xc6, 0x80, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x86, 0x30, 0x87, 0x0c, 0x37, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xc7, 0x2b, 0x0b, 0x62, 0x37, 0x01, 0x00, 0x00, } func (m *TotalBurnedNeutronsAmount) Marshal() (dAtA []byte, err error) { diff --git a/x/feeburner/types/tx.pb.go b/x/feeburner/types/tx.pb.go index d25168e3c..4fa73aa2f 100644 --- a/x/feeburner/types/tx.pb.go +++ b/x/feeburner/types/tx.pb.go @@ -158,9 +158,9 @@ var fileDescriptor_49e6591b4db80f7f = []byte{ 0xac, 0x06, 0x66, 0x8d, 0x14, 0x6b, 0x03, 0xc8, 0xf9, 0x4e, 0xbe, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x9c, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, - 0xab, 0x0f, 0x35, 0x56, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd1, 0xaf, 0x40, 0x4e, + 0xab, 0x0f, 0x35, 0x56, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x40, 0x4e, 0x22, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x68, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, - 0x04, 0x06, 0x52, 0xb9, 0x44, 0x02, 0x00, 0x00, + 0x45, 0x1d, 0xde, 0xd7, 0x44, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/client/cli/query.go b/x/feerefunder/client/cli/query.go index 1d25877a5..bd31d52b3 100644 --- a/x/feerefunder/client/cli/query.go +++ b/x/feerefunder/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/feerefunder/client/cli/query_params.go b/x/feerefunder/client/cli/query_params.go index 49e5a9155..42d0eb378 100644 --- a/x/feerefunder/client/cli/query_params.go +++ b/x/feerefunder/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/feerefunder/client/cli/query_test.go b/x/feerefunder/client/cli/query_test.go index 84d3bbca2..7afdeb82c 100644 --- a/x/feerefunder/client/cli/query_test.go +++ b/x/feerefunder/client/cli/query_test.go @@ -3,7 +3,7 @@ package cli_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "cosmossdk.io/math" @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/contractmanager/network" - "github.com/neutron-org/neutron/v4/x/feerefunder/client/cli" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/testutil/contractmanager/network" + "github.com/neutron-org/neutron/v5/x/feerefunder/client/cli" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func feeRefunderNetwork(t *testing.T, feeInfo types.Fee) *network.Network { diff --git a/x/feerefunder/genesis.go b/x/feerefunder/genesis.go index 9c0f44c82..e2a85989e 100644 --- a/x/feerefunder/genesis.go +++ b/x/feerefunder/genesis.go @@ -3,8 +3,8 @@ package feerefunder import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/feerefunder/keeper" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/keeper" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/feerefunder/genesis_test.go b/x/feerefunder/genesis_test.go index 6f914e278..d38f6f9fa 100644 --- a/x/feerefunder/genesis_test.go +++ b/x/feerefunder/genesis_test.go @@ -5,15 +5,15 @@ import ( "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil/feerefunder/keeper" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil/feerefunder/keeper" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - "github.com/neutron-org/neutron/v4/x/feerefunder" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + "github.com/neutron-org/neutron/v5/x/feerefunder" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) const TestContractAddressNeutron = "neutron14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s5c2epq" diff --git a/x/feerefunder/keeper/export_test.go b/x/feerefunder/keeper/export_test.go index b29fbc31a..e3cedffe6 100644 --- a/x/feerefunder/keeper/export_test.go +++ b/x/feerefunder/keeper/export_test.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func (k Keeper) CheckFees(ctx sdk.Context, fees types.Fee) error { diff --git a/x/feerefunder/keeper/grpc_query.go b/x/feerefunder/keeper/grpc_query.go index 064a346ac..7ee4524f9 100644 --- a/x/feerefunder/keeper/grpc_query.go +++ b/x/feerefunder/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/feerefunder/keeper/grpc_query_params.go b/x/feerefunder/keeper/grpc_query_params.go index e22502beb..99cce3091 100644 --- a/x/feerefunder/keeper/grpc_query_params.go +++ b/x/feerefunder/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/feerefunder/keeper/grpc_query_params_test.go b/x/feerefunder/keeper/grpc_query_params_test.go index 70d1dc0cb..1076057c8 100644 --- a/x/feerefunder/keeper/grpc_query_params_test.go +++ b/x/feerefunder/keeper/grpc_query_params_test.go @@ -3,11 +3,11 @@ package keeper_test import ( "testing" - testkeeper "github.com/neutron-org/neutron/v4/testutil/feerefunder/keeper" + testkeeper "github.com/neutron-org/neutron/v5/testutil/feerefunder/keeper" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/feerefunder/keeper/keeper.go b/x/feerefunder/keeper/keeper.go index fecaf59b4..a38ce85e6 100644 --- a/x/feerefunder/keeper/keeper.go +++ b/x/feerefunder/keeper/keeper.go @@ -15,7 +15,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) type ( diff --git a/x/feerefunder/keeper/keeper_test.go b/x/feerefunder/keeper/keeper_test.go index 0182998ca..1524726d6 100644 --- a/x/feerefunder/keeper/keeper_test.go +++ b/x/feerefunder/keeper/keeper_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "github.com/neutron-org/neutron/v4/testutil" - testutil_keeper "github.com/neutron-org/neutron/v4/testutil/feerefunder/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/feerefunder/types" + "github.com/neutron-org/neutron/v5/testutil" + testutil_keeper "github.com/neutron-org/neutron/v5/testutil/feerefunder/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/feerefunder/types" cosmoserrors "cosmossdk.io/errors" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -20,7 +20,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ) diff --git a/x/feerefunder/keeper/msg_server.go b/x/feerefunder/keeper/msg_server.go index 891d1ecfc..85961c38d 100644 --- a/x/feerefunder/keeper/msg_server.go +++ b/x/feerefunder/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) type msgServer struct { diff --git a/x/feerefunder/keeper/msg_server_test.go b/x/feerefunder/keeper/msg_server_test.go index 158ced45e..deb29b9df 100644 --- a/x/feerefunder/keeper/msg_server_test.go +++ b/x/feerefunder/keeper/msg_server_test.go @@ -8,10 +8,10 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/testutil/feerefunder/keeper" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/testutil/feerefunder/keeper" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func TestMsgUpdateParamsValidate(t *testing.T) { diff --git a/x/feerefunder/keeper/params.go b/x/feerefunder/keeper/params.go index 3dda4b096..a765d54b4 100644 --- a/x/feerefunder/keeper/params.go +++ b/x/feerefunder/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) // GetParams get all parameters as types.Params diff --git a/x/feerefunder/keeper/params_test.go b/x/feerefunder/keeper/params_test.go index e904004a9..3d163d4fb 100644 --- a/x/feerefunder/keeper/params_test.go +++ b/x/feerefunder/keeper/params_test.go @@ -3,11 +3,11 @@ package keeper_test import ( "testing" - testkeeper "github.com/neutron-org/neutron/v4/testutil/feerefunder/keeper" + testkeeper "github.com/neutron-org/neutron/v5/testutil/feerefunder/keeper" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) func TestGetParams(t *testing.T) { diff --git a/x/feerefunder/module.go b/x/feerefunder/module.go index 74efab243..a019a5104 100644 --- a/x/feerefunder/module.go +++ b/x/feerefunder/module.go @@ -21,9 +21,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/feerefunder/client/cli" - "github.com/neutron-org/neutron/v4/x/feerefunder/keeper" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/client/cli" + "github.com/neutron-org/neutron/v5/x/feerefunder/keeper" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) var ( diff --git a/x/feerefunder/types/fee.pb.go b/x/feerefunder/types/fee.pb.go index 540bc0581..65562320c 100644 --- a/x/feerefunder/types/fee.pb.go +++ b/x/feerefunder/types/fee.pb.go @@ -158,30 +158,30 @@ func init() { proto.RegisterFile("neutron/feerefunder/fee.proto", fileDescriptor var fileDescriptor_08c389f5f82f1076 = []byte{ // 384 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xbd, 0x6e, 0xe2, 0x40, - 0x14, 0x85, 0x3d, 0xb0, 0xe2, 0x67, 0x90, 0x76, 0x25, 0xef, 0x4a, 0xcb, 0x22, 0x61, 0x90, 0x2b, - 0x37, 0x78, 0xc4, 0xfe, 0x34, 0x5b, 0x42, 0x84, 0x44, 0x95, 0x88, 0x32, 0x45, 0x90, 0x3d, 0xbe, - 0x18, 0xcb, 0x78, 0x86, 0xd8, 0x63, 0x2b, 0xb4, 0x79, 0x82, 0x3c, 0x47, 0x9e, 0x84, 0x92, 0x32, - 0x15, 0x89, 0xe0, 0x0d, 0xd2, 0x47, 0x8a, 0xc6, 0x1e, 0x22, 0x52, 0x21, 0xaa, 0x39, 0x33, 0x47, - 0xe7, 0x7c, 0x77, 0xa4, 0x8b, 0xdb, 0x0c, 0x52, 0x11, 0x73, 0x46, 0x66, 0x00, 0x31, 0xcc, 0x52, - 0xe6, 0x41, 0x2c, 0xb5, 0xbd, 0x8c, 0xb9, 0xe0, 0xfa, 0x77, 0x65, 0xdb, 0x47, 0x76, 0xcb, 0xa0, - 0x3c, 0x89, 0x78, 0x42, 0x5c, 0x27, 0x01, 0x92, 0xf5, 0x5d, 0x10, 0x4e, 0x9f, 0x50, 0x1e, 0xb0, - 0x22, 0xd4, 0xfa, 0xe1, 0x73, 0x9f, 0xe7, 0x92, 0x48, 0x55, 0xbc, 0x9a, 0x6f, 0x25, 0x5c, 0x1e, - 0x01, 0xe8, 0x2b, 0x5c, 0x8b, 0x81, 0x66, 0xd3, 0x19, 0x40, 0x13, 0x75, 0xcb, 0x56, 0xe3, 0xf7, - 0x2f, 0xbb, 0x28, 0xb4, 0x65, 0xa1, 0xad, 0x0a, 0xed, 0x21, 0x0f, 0xd8, 0x60, 0xb8, 0xde, 0x76, - 0xb4, 0xd7, 0x6d, 0xe7, 0xdb, 0xca, 0x89, 0x16, 0xff, 0xcd, 0x43, 0xd0, 0x7c, 0x7c, 0xee, 0x58, - 0x7e, 0x20, 0xe6, 0xa9, 0x6b, 0x53, 0x1e, 0x11, 0x35, 0x50, 0x71, 0xf4, 0x12, 0x2f, 0x24, 0x62, - 0xb5, 0x84, 0x24, 0xef, 0x48, 0x26, 0x55, 0x19, 0x93, 0xe8, 0x0c, 0x57, 0x1d, 0x1a, 0xe6, 0xe4, - 0xd2, 0x29, 0xf2, 0x40, 0x91, 0xbf, 0x16, 0x64, 0x95, 0x3b, 0x0f, 0x5c, 0x71, 0x68, 0x28, 0xb9, - 0xf7, 0x08, 0x37, 0x44, 0x10, 0x01, 0x4f, 0x45, 0x0e, 0x2f, 0x9f, 0x82, 0x8f, 0x14, 0x5c, 0x2f, - 0xe0, 0x47, 0xd9, 0xf3, 0x06, 0xc0, 0x2a, 0x39, 0x02, 0x30, 0x6f, 0x70, 0xed, 0xca, 0xa1, 0x21, - 0x88, 0xf1, 0x85, 0xde, 0xc6, 0x98, 0xce, 0x1d, 0xc6, 0x60, 0x31, 0x0d, 0xbc, 0x26, 0xea, 0x22, - 0xab, 0x3e, 0xa9, 0xab, 0x97, 0xb1, 0xa7, 0xff, 0xc4, 0xd5, 0x25, 0x8f, 0x85, 0xf4, 0x4a, 0xb9, - 0x57, 0x91, 0xd7, 0xb1, 0xa7, 0xb7, 0x70, 0x2d, 0x81, 0xdb, 0x14, 0x18, 0x95, 0x9f, 0x40, 0xd6, - 0x97, 0xc9, 0xc7, 0x7d, 0x70, 0xb9, 0xde, 0x19, 0x68, 0xb3, 0x33, 0xd0, 0xcb, 0xce, 0x40, 0x0f, - 0x7b, 0x43, 0xdb, 0xec, 0x0d, 0xed, 0x69, 0x6f, 0x68, 0xd7, 0xff, 0x8e, 0xe6, 0x55, 0xfb, 0xd4, - 0xe3, 0xb1, 0x7f, 0xd0, 0x24, 0xfb, 0x4b, 0xee, 0x3e, 0xed, 0x5f, 0xfe, 0x05, 0xb7, 0x92, 0xef, - 0xcd, 0x9f, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x9c, 0xd3, 0x7d, 0xa3, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x6b, 0xe2, 0x40, + 0x18, 0xc6, 0x33, 0xba, 0xf8, 0x67, 0x84, 0x5d, 0xc8, 0x2e, 0xac, 0x2b, 0x18, 0x25, 0xa7, 0x5c, + 0xcc, 0xe0, 0x2e, 0x5e, 0xf6, 0xa8, 0x8b, 0xe0, 0x69, 0x8b, 0xc7, 0x1e, 0x2a, 0xc9, 0xe4, 0x35, + 0x86, 0x98, 0x19, 0x9b, 0x4c, 0x42, 0xbd, 0xf6, 0x13, 0xf4, 0x73, 0xf4, 0x93, 0x78, 0xf4, 0xd8, + 0x93, 0x2d, 0xfa, 0x0d, 0x7a, 0x2f, 0x94, 0x49, 0xc6, 0x62, 0x4f, 0xe2, 0x69, 0x9e, 0x99, 0x87, + 0xe7, 0xf9, 0xbd, 0x03, 0x2f, 0x6e, 0x33, 0x48, 0x45, 0xcc, 0x19, 0x99, 0x03, 0xc4, 0x30, 0x4f, + 0x99, 0x07, 0xb1, 0xd4, 0xf6, 0x2a, 0xe6, 0x82, 0xeb, 0xdf, 0x95, 0x6d, 0x9f, 0xd8, 0x2d, 0x83, + 0xf2, 0x24, 0xe2, 0x09, 0x71, 0x9d, 0x04, 0x48, 0xd6, 0x77, 0x41, 0x38, 0x7d, 0x42, 0x79, 0xc0, + 0x8a, 0x50, 0xeb, 0x87, 0xcf, 0x7d, 0x9e, 0x4b, 0x22, 0x55, 0xf1, 0x6a, 0xbe, 0x95, 0x70, 0x79, + 0x0c, 0xa0, 0xaf, 0x71, 0x2d, 0x06, 0x9a, 0xcd, 0xe6, 0x00, 0x4d, 0xd4, 0x2d, 0x5b, 0x8d, 0xdf, + 0xbf, 0xec, 0xa2, 0xd0, 0x96, 0x85, 0xb6, 0x2a, 0xb4, 0x47, 0x3c, 0x60, 0xc3, 0xd1, 0x66, 0xd7, + 0xd1, 0x5e, 0x77, 0x9d, 0x6f, 0x6b, 0x27, 0x5a, 0xfe, 0x35, 0x8f, 0x41, 0xf3, 0xf1, 0xb9, 0x63, + 0xf9, 0x81, 0x58, 0xa4, 0xae, 0x4d, 0x79, 0x44, 0xd4, 0x40, 0xc5, 0xd1, 0x4b, 0xbc, 0x90, 0x88, + 0xf5, 0x0a, 0x92, 0xbc, 0x23, 0x99, 0x56, 0x65, 0x4c, 0xa2, 0x33, 0x5c, 0x75, 0x68, 0x98, 0x93, + 0x4b, 0xe7, 0xc8, 0x43, 0x45, 0xfe, 0x5a, 0x90, 0x55, 0xee, 0x32, 0x70, 0xc5, 0xa1, 0xa1, 0xe4, + 0xde, 0x23, 0xdc, 0x10, 0x41, 0x04, 0x3c, 0x15, 0x39, 0xbc, 0x7c, 0x0e, 0x3e, 0x56, 0x70, 0xbd, + 0x80, 0x9f, 0x64, 0x2f, 0x1b, 0x00, 0xab, 0xe4, 0x18, 0xc0, 0xbc, 0xc1, 0xb5, 0x2b, 0x87, 0x86, + 0x20, 0x26, 0xff, 0xf4, 0x36, 0xc6, 0x74, 0xe1, 0x30, 0x06, 0xcb, 0x59, 0xe0, 0x35, 0x51, 0x17, + 0x59, 0xf5, 0x69, 0x5d, 0xbd, 0x4c, 0x3c, 0xfd, 0x27, 0xae, 0xae, 0x78, 0x2c, 0xa4, 0x57, 0xca, + 0xbd, 0x8a, 0xbc, 0x4e, 0x3c, 0xbd, 0x85, 0x6b, 0x09, 0xdc, 0xa6, 0xc0, 0xa8, 0xfc, 0x04, 0xb2, + 0xbe, 0x4c, 0x3f, 0xee, 0xc3, 0xff, 0x9b, 0xbd, 0x81, 0xb6, 0x7b, 0x03, 0xbd, 0xec, 0x0d, 0xf4, + 0x70, 0x30, 0xb4, 0xed, 0xc1, 0xd0, 0x9e, 0x0e, 0x86, 0x76, 0x3d, 0x38, 0x99, 0x57, 0xed, 0x53, + 0x8f, 0xc7, 0xfe, 0x51, 0x93, 0x6c, 0x40, 0xee, 0x3e, 0xed, 0x5f, 0xfe, 0x05, 0xb7, 0x92, 0xef, + 0xcd, 0x9f, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x45, 0xd4, 0x1e, 0xa3, 0x02, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/types/genesis.pb.go b/x/feerefunder/types/genesis.pb.go index 682002bcf..e4660599d 100644 --- a/x/feerefunder/types/genesis.pb.go +++ b/x/feerefunder/types/genesis.pb.go @@ -146,25 +146,25 @@ func init() { proto.RegisterFile("neutron/feerefunder/genesis.proto", fileDescri var fileDescriptor_43aedfe31f06653d = []byte{ // 314 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xb1, 0x4f, 0x02, 0x31, - 0x14, 0xc6, 0xaf, 0xa0, 0x28, 0xc5, 0xa9, 0x32, 0x5c, 0x50, 0x2a, 0x32, 0xb1, 0x78, 0x35, 0xa8, - 0x83, 0x93, 0x86, 0x18, 0x0d, 0x93, 0x06, 0x37, 0x17, 0x72, 0xc0, 0xeb, 0x79, 0x31, 0xb4, 0x97, - 0x5e, 0x31, 0xf2, 0x2f, 0x38, 0x99, 0xf8, 0x4f, 0x31, 0x32, 0x3a, 0x19, 0xc3, 0xfd, 0x23, 0xe6, - 0xda, 0x92, 0x68, 0x72, 0x6c, 0xef, 0xe5, 0xfb, 0x7d, 0xef, 0xfb, 0xf2, 0xf0, 0xb1, 0x80, 0x99, - 0x56, 0x52, 0x30, 0x0e, 0xa0, 0x80, 0xcf, 0xc4, 0x04, 0x14, 0x8b, 0x40, 0x40, 0x1a, 0xa7, 0x41, - 0xa2, 0xa4, 0x96, 0x64, 0xdf, 0x21, 0xc1, 0x1f, 0xa4, 0x51, 0x8f, 0x64, 0x24, 0x8d, 0xce, 0xf2, - 0xc9, 0xa2, 0x8d, 0x66, 0xd1, 0x35, 0x0e, 0xe0, 0xe4, 0x56, 0x91, 0x9c, 0x84, 0x2a, 0x9c, 0xba, - 0xac, 0xf6, 0x3b, 0xc2, 0x7b, 0x77, 0x36, 0xfd, 0x51, 0x87, 0x1a, 0xc8, 0x25, 0xae, 0x58, 0xc0, - 0x47, 0x2d, 0xd4, 0xa9, 0x75, 0x0f, 0x82, 0x82, 0x36, 0xc1, 0x83, 0x41, 0x7a, 0x5b, 0x8b, 0xef, - 0x23, 0x6f, 0xe0, 0x0c, 0xe4, 0x0a, 0x57, 0x39, 0xc0, 0x30, 0x16, 0x5c, 0xa6, 0x7e, 0xa9, 0x55, - 0xee, 0xd4, 0xba, 0x87, 0x85, 0xee, 0x5b, 0x80, 0xbe, 0xe0, 0xd2, 0xd9, 0x77, 0xb9, 0x5d, 0xd3, - 0xf6, 0x27, 0xc2, 0x3b, 0x4e, 0x23, 0x75, 0xbc, 0x9d, 0x84, 0x73, 0x50, 0xa6, 0x46, 0x75, 0x60, - 0x17, 0x72, 0x8d, 0xab, 0x49, 0x38, 0x7e, 0x01, 0x3d, 0x8c, 0x27, 0x7e, 0xc9, 0x14, 0x6c, 0x6e, - 0x28, 0x98, 0x53, 0xfd, 0x9b, 0x75, 0x86, 0x75, 0xf5, 0x27, 0xe4, 0x14, 0x97, 0x39, 0x80, 0x5f, - 0x36, 0x5e, 0x7f, 0x53, 0x3d, 0x67, 0xcb, 0xd1, 0xde, 0xfd, 0x62, 0x45, 0xd1, 0x72, 0x45, 0xd1, - 0xcf, 0x8a, 0xa2, 0x8f, 0x8c, 0x7a, 0xcb, 0x8c, 0x7a, 0x5f, 0x19, 0xf5, 0x9e, 0x2e, 0xa2, 0x58, - 0x3f, 0xcf, 0x46, 0xc1, 0x58, 0x4e, 0x99, 0x3b, 0x74, 0x22, 0x55, 0xb4, 0x9e, 0xd9, 0xeb, 0x39, - 0x7b, 0xfb, 0xf7, 0x7a, 0x3d, 0x4f, 0x20, 0x1d, 0x55, 0xcc, 0xeb, 0xcf, 0x7e, 0x03, 0x00, 0x00, - 0xff, 0xff, 0xeb, 0xe0, 0x85, 0x41, 0x0b, 0x02, 0x00, 0x00, + 0x14, 0xc6, 0xaf, 0xa0, 0x28, 0xc5, 0xa9, 0x32, 0x5c, 0x50, 0x2a, 0x32, 0xb1, 0x78, 0x35, 0x18, + 0x06, 0x27, 0x0d, 0x31, 0x1a, 0x26, 0x0d, 0x6e, 0x2e, 0xe4, 0x80, 0xd7, 0xf3, 0x62, 0x68, 0x2f, + 0xbd, 0x62, 0xe4, 0x5f, 0x70, 0x32, 0xf1, 0x9f, 0x62, 0x64, 0x74, 0x32, 0x86, 0xfb, 0x47, 0xcc, + 0xb5, 0x25, 0xd1, 0xe4, 0xd8, 0xde, 0xcb, 0xf7, 0xfb, 0xde, 0xf7, 0xe5, 0xe1, 0x53, 0x01, 0x73, + 0xad, 0xa4, 0x60, 0x1c, 0x40, 0x01, 0x9f, 0x8b, 0x29, 0x28, 0x16, 0x81, 0x80, 0x34, 0x4e, 0x83, + 0x44, 0x49, 0x2d, 0xc9, 0xa1, 0x43, 0x82, 0x3f, 0x48, 0xa3, 0x1e, 0xc9, 0x48, 0x1a, 0x9d, 0xe5, + 0x93, 0x45, 0x1b, 0xcd, 0xa2, 0x6b, 0x1c, 0xc0, 0xc9, 0xad, 0x22, 0x39, 0x09, 0x55, 0x38, 0x73, + 0x59, 0xed, 0x77, 0x84, 0x0f, 0xee, 0x6c, 0xfa, 0xa3, 0x0e, 0x35, 0x90, 0x4b, 0x5c, 0xb1, 0x80, + 0x8f, 0x5a, 0xa8, 0x53, 0xeb, 0x1e, 0x05, 0x05, 0x6d, 0x82, 0x07, 0x83, 0xf4, 0x77, 0x96, 0xdf, + 0x27, 0xde, 0xd0, 0x19, 0xc8, 0x15, 0xae, 0x72, 0x80, 0x51, 0x2c, 0xb8, 0x4c, 0xfd, 0x52, 0xab, + 0xdc, 0xa9, 0x75, 0x8f, 0x0b, 0xdd, 0xb7, 0x00, 0x03, 0xc1, 0xa5, 0xb3, 0xef, 0x73, 0xbb, 0xa6, + 0xed, 0x4f, 0x84, 0xf7, 0x9c, 0x46, 0xea, 0x78, 0x37, 0x09, 0x17, 0xa0, 0x4c, 0x8d, 0xea, 0xd0, + 0x2e, 0xe4, 0x1a, 0x57, 0x93, 0x70, 0xf2, 0x02, 0x7a, 0x14, 0x4f, 0xfd, 0x92, 0x29, 0xd8, 0xdc, + 0x52, 0x30, 0xa7, 0x06, 0x37, 0x9b, 0x0c, 0xeb, 0x1a, 0x4c, 0xc9, 0x39, 0x2e, 0x73, 0x00, 0xbf, + 0x6c, 0xbc, 0xfe, 0xb6, 0x7a, 0xce, 0x96, 0xa3, 0xfd, 0xfb, 0xe5, 0x9a, 0xa2, 0xd5, 0x9a, 0xa2, + 0x9f, 0x35, 0x45, 0x1f, 0x19, 0xf5, 0x56, 0x19, 0xf5, 0xbe, 0x32, 0xea, 0x3d, 0xf5, 0xa2, 0x58, + 0x3f, 0xcf, 0xc7, 0xc1, 0x44, 0xce, 0x98, 0x3b, 0x74, 0x26, 0x55, 0xb4, 0x99, 0xd9, 0x6b, 0x8f, + 0xbd, 0xfd, 0x7b, 0xbd, 0x5e, 0x24, 0x90, 0x8e, 0x2b, 0xe6, 0xf5, 0x17, 0xbf, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xcf, 0x39, 0x82, 0x22, 0x0b, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/types/genesis_test.go b/x/feerefunder/types/genesis_test.go index 58cbc4591..69da3884c 100644 --- a/x/feerefunder/types/genesis_test.go +++ b/x/feerefunder/types/genesis_test.go @@ -3,16 +3,16 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) const ( diff --git a/x/feerefunder/types/params.go b/x/feerefunder/types/params.go index d9d149bb7..4598ebe99 100644 --- a/x/feerefunder/types/params.go +++ b/x/feerefunder/types/params.go @@ -8,7 +8,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "gopkg.in/yaml.v2" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/feerefunder/types/params.pb.go b/x/feerefunder/types/params.pb.go index 1bdb0da76..cfff95815 100644 --- a/x/feerefunder/types/params.pb.go +++ b/x/feerefunder/types/params.pb.go @@ -86,8 +86,8 @@ var fileDescriptor_2dae67276ca81c89 = []byte{ 0xf2, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xd3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x89, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, - 0x7e, 0x99, 0x89, 0x7e, 0x05, 0x8a, 0xeb, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x0e, - 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x22, 0x03, 0x03, 0x97, 0x0e, 0x01, 0x00, 0x00, + 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0x8a, 0xeb, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x0e, + 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x06, 0xda, 0x04, 0xf4, 0x0e, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/feerefunder/types/query.pb.go b/x/feerefunder/types/query.pb.go index 7bd8573fa..a0824ef5c 100644 --- a/x/feerefunder/types/query.pb.go +++ b/x/feerefunder/types/query.pb.go @@ -230,32 +230,32 @@ var fileDescriptor_c20b5686ec46d4e6 = []byte{ // 441 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xc1, 0x6b, 0xd4, 0x40, 0x14, 0xc6, 0x77, 0xd6, 0xba, 0xdb, 0x8e, 0xa0, 0x30, 0x2d, 0x58, 0x62, 0x4d, 0xd7, 0xa8, 0xec, - 0x2a, 0x34, 0x43, 0xab, 0x22, 0x5e, 0x7b, 0x10, 0xd6, 0x8b, 0x35, 0x47, 0x2f, 0x65, 0x92, 0xbc, - 0x4c, 0x03, 0xdd, 0x79, 0xe9, 0xcc, 0xa4, 0xd8, 0xab, 0x5e, 0x3d, 0x08, 0x5e, 0xfd, 0x83, 0x7a, - 0x2c, 0x78, 0xf1, 0x24, 0xb2, 0xeb, 0x1f, 0x22, 0x99, 0x4c, 0x8b, 0xc5, 0xd8, 0xde, 0x66, 0xde, - 0xfb, 0xbe, 0x6f, 0x7e, 0xef, 0x25, 0x74, 0x53, 0x41, 0x6d, 0x35, 0x2a, 0x5e, 0x00, 0x68, 0x28, - 0x6a, 0x95, 0x83, 0xe6, 0x47, 0x35, 0xe8, 0x93, 0xb8, 0xd2, 0x68, 0x91, 0xad, 0x7a, 0x41, 0xfc, - 0x97, 0x20, 0x78, 0x9a, 0xa1, 0x99, 0xa1, 0xe1, 0xa9, 0x30, 0xd0, 0xaa, 0xf9, 0xf1, 0x76, 0x0a, - 0x56, 0x6c, 0xf3, 0x4a, 0xc8, 0x52, 0x09, 0x5b, 0xa2, 0x6a, 0x03, 0x82, 0x35, 0x89, 0x12, 0xdd, - 0x91, 0x37, 0x27, 0x5f, 0xdd, 0x90, 0x88, 0xf2, 0x10, 0xb8, 0xa8, 0x4a, 0x2e, 0x94, 0x42, 0xeb, - 0x2c, 0xc6, 0x77, 0x1f, 0x74, 0x51, 0x49, 0x50, 0x60, 0xca, 0x73, 0xc9, 0xa8, 0x4b, 0x52, 0x09, - 0x2d, 0x66, 0x5e, 0x11, 0xad, 0x51, 0xf6, 0xae, 0x41, 0xdb, 0x73, 0xc5, 0x04, 0x8e, 0x6a, 0x30, - 0x36, 0xda, 0xa3, 0xab, 0x97, 0xaa, 0xa6, 0x42, 0x65, 0x80, 0xbd, 0xa2, 0x83, 0xd6, 0xbc, 0x4e, - 0x46, 0x64, 0x72, 0x6b, 0xe7, 0x5e, 0xdc, 0x31, 0x77, 0xdc, 0x9a, 0x76, 0x97, 0x4e, 0x7f, 0x6e, - 0xf6, 0x12, 0x6f, 0x88, 0x72, 0x7a, 0xfb, 0x35, 0xc0, 0x54, 0x15, 0xe8, 0xdf, 0x60, 0xf7, 0x29, - 0xcd, 0x0e, 0x84, 0x52, 0x70, 0xb8, 0x5f, 0xe6, 0x2e, 0x70, 0x25, 0x59, 0xf1, 0x95, 0x69, 0xce, - 0xee, 0xd2, 0x61, 0x85, 0xda, 0x36, 0xbd, 0xbe, 0xeb, 0x0d, 0x9a, 0xeb, 0x34, 0x67, 0x01, 0x5d, - 0x36, 0x4d, 0x84, 0xca, 0x60, 0xfd, 0xc6, 0x88, 0x4c, 0x96, 0x92, 0x8b, 0x7b, 0xf4, 0x86, 0xde, - 0xb9, 0x78, 0xc5, 0x33, 0xbf, 0xa4, 0xcb, 0x05, 0xc0, 0x7e, 0xa9, 0x0a, 0xf4, 0xd4, 0x1b, 0x9d, - 0xd4, 0xe7, 0xbe, 0x61, 0xd1, 0x1e, 0x76, 0xbe, 0xf5, 0xe9, 0x4d, 0xb7, 0x04, 0xf6, 0x99, 0xd0, - 0x41, 0x3b, 0x14, 0x1b, 0x77, 0x7a, 0xff, 0xdd, 0x60, 0x30, 0xb9, 0x5e, 0xd8, 0x02, 0x46, 0xfc, - 0xe3, 0xf7, 0xdf, 0x5f, 0xfb, 0x4f, 0xd8, 0x98, 0x7b, 0xc7, 0x16, 0x6a, 0xc9, 0xff, 0xff, 0xe1, - 0xd8, 0x27, 0x42, 0x87, 0x9e, 0x96, 0x3d, 0xbc, 0x72, 0x16, 0xcf, 0xf2, 0xe8, 0x6a, 0x91, 0xe7, - 0xd8, 0x72, 0x1c, 0x63, 0xf6, 0xf8, 0x5a, 0x8e, 0x66, 0x97, 0xbb, 0x6f, 0x4f, 0xe7, 0x21, 0x39, - 0x9b, 0x87, 0xe4, 0xd7, 0x3c, 0x24, 0x5f, 0x16, 0x61, 0xef, 0x6c, 0x11, 0xf6, 0x7e, 0x2c, 0xc2, - 0xde, 0xfb, 0x17, 0xb2, 0xb4, 0x07, 0x75, 0x1a, 0x67, 0x38, 0xeb, 0x8c, 0x3a, 0x7e, 0xce, 0x3f, - 0x5c, 0xca, 0xb3, 0x27, 0x15, 0x98, 0x74, 0xe0, 0x7e, 0xc8, 0x67, 0x7f, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xa5, 0xf2, 0x80, 0x6c, 0x6d, 0x03, 0x00, 0x00, + 0x2a, 0x34, 0x43, 0x2b, 0x45, 0xbc, 0xf6, 0x20, 0xac, 0x17, 0x6b, 0x8e, 0x5e, 0xca, 0x24, 0x79, + 0x99, 0x06, 0xba, 0xf3, 0xd2, 0x99, 0x49, 0xb1, 0x57, 0xbd, 0x7a, 0x10, 0xbc, 0xfa, 0x07, 0xf5, + 0x58, 0xf0, 0xe2, 0x49, 0x64, 0xd7, 0x3f, 0x44, 0x32, 0x99, 0x16, 0x8b, 0xb1, 0xbd, 0xcd, 0xbc, + 0xf7, 0x7d, 0xdf, 0xfc, 0xde, 0x4b, 0xe8, 0xa6, 0x82, 0xda, 0x6a, 0x54, 0xbc, 0x00, 0xd0, 0x50, + 0xd4, 0x2a, 0x07, 0xcd, 0x8f, 0x6b, 0xd0, 0xa7, 0x71, 0xa5, 0xd1, 0x22, 0x5b, 0xf5, 0x82, 0xf8, + 0x2f, 0x41, 0xf0, 0x3c, 0x43, 0x33, 0x43, 0xc3, 0x53, 0x61, 0xa0, 0x55, 0xf3, 0x93, 0xed, 0x14, + 0xac, 0xd8, 0xe6, 0x95, 0x90, 0xa5, 0x12, 0xb6, 0x44, 0xd5, 0x06, 0x04, 0x6b, 0x12, 0x25, 0xba, + 0x23, 0x6f, 0x4e, 0xbe, 0xba, 0x21, 0x11, 0xe5, 0x11, 0x70, 0x51, 0x95, 0x5c, 0x28, 0x85, 0xd6, + 0x59, 0x8c, 0xef, 0x3e, 0xea, 0xa2, 0x92, 0xa0, 0xc0, 0x94, 0x17, 0x92, 0x51, 0x97, 0xa4, 0x12, + 0x5a, 0xcc, 0xbc, 0x22, 0x5a, 0xa3, 0xec, 0x5d, 0x83, 0xb6, 0xef, 0x8a, 0x09, 0x1c, 0xd7, 0x60, + 0x6c, 0xb4, 0x4f, 0x57, 0xaf, 0x54, 0x4d, 0x85, 0xca, 0x00, 0x7b, 0x45, 0x07, 0xad, 0x79, 0x9d, + 0x8c, 0xc8, 0xe4, 0xce, 0xce, 0x83, 0xb8, 0x63, 0xee, 0xb8, 0x35, 0xed, 0x2d, 0x9d, 0xfd, 0xdc, + 0xec, 0x25, 0xde, 0x10, 0xe5, 0xf4, 0xee, 0x6b, 0x80, 0xa9, 0x2a, 0xd0, 0xbf, 0xc1, 0x1e, 0x52, + 0x9a, 0x1d, 0x0a, 0xa5, 0xe0, 0xe8, 0xa0, 0xcc, 0x5d, 0xe0, 0x4a, 0xb2, 0xe2, 0x2b, 0xd3, 0x9c, + 0xdd, 0xa7, 0xc3, 0x0a, 0xb5, 0x6d, 0x7a, 0x7d, 0xd7, 0x1b, 0x34, 0xd7, 0x69, 0xce, 0x02, 0xba, + 0x6c, 0x9a, 0x08, 0x95, 0xc1, 0xfa, 0xad, 0x11, 0x99, 0x2c, 0x25, 0x97, 0xf7, 0xe8, 0x0d, 0xbd, + 0x77, 0xf9, 0x8a, 0x67, 0x7e, 0x49, 0x97, 0x0b, 0x80, 0x83, 0x52, 0x15, 0xe8, 0xa9, 0x37, 0x3a, + 0xa9, 0x2f, 0x7c, 0xc3, 0xa2, 0x3d, 0xec, 0x7c, 0xeb, 0xd3, 0xdb, 0x6e, 0x09, 0xec, 0x33, 0xa1, + 0x83, 0x76, 0x28, 0x36, 0xee, 0xf4, 0xfe, 0xbb, 0xc1, 0x60, 0x72, 0xb3, 0xb0, 0x05, 0x8c, 0xf8, + 0xc7, 0xef, 0xbf, 0xbf, 0xf6, 0x9f, 0xb1, 0x31, 0xf7, 0x8e, 0x2d, 0xd4, 0x92, 0xff, 0xff, 0xc3, + 0xb1, 0x4f, 0x84, 0x0e, 0x3d, 0x2d, 0x7b, 0x7c, 0xed, 0x2c, 0x9e, 0xe5, 0xc9, 0xf5, 0x22, 0xcf, + 0xb1, 0xe5, 0x38, 0xc6, 0xec, 0xe9, 0x8d, 0x1c, 0xcd, 0x2e, 0xf7, 0xde, 0x9e, 0xcd, 0x43, 0x72, + 0x3e, 0x0f, 0xc9, 0xaf, 0x79, 0x48, 0xbe, 0x2c, 0xc2, 0xde, 0xf9, 0x22, 0xec, 0xfd, 0x58, 0x84, + 0xbd, 0xf7, 0xbb, 0xb2, 0xb4, 0x87, 0x75, 0x1a, 0x67, 0x38, 0xeb, 0x8c, 0x3a, 0xd9, 0xe5, 0x1f, + 0xae, 0xe4, 0xd9, 0xd3, 0x0a, 0x4c, 0x3a, 0x70, 0x3f, 0xe4, 0x8b, 0x3f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x81, 0x2b, 0x87, 0x0f, 0x6d, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/feerefunder/types/tx.pb.go b/x/feerefunder/types/tx.pb.go index 3688fce95..4ed9d628a 100644 --- a/x/feerefunder/types/tx.pb.go +++ b/x/feerefunder/types/tx.pb.go @@ -158,9 +158,9 @@ var fileDescriptor_2e613aff856d34ed = []byte{ 0x29, 0x1d, 0x62, 0x54, 0xc1, 0xac, 0x92, 0x62, 0x6d, 0x00, 0x79, 0xc2, 0xc9, 0xff, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x4c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, - 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x06, 0xeb, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0x26, 0xfa, + 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x06, 0xeb, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0xa8, 0x09, 0xa6, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x41, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xb2, 0x97, 0x0b, 0xe2, 0x54, 0x02, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x96, 0x4e, 0x0c, 0x81, 0x54, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index 656eb013a..e2c9c07c8 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test.go b/x/globalfee/ante/antetest/fee_test.go index de325da9b..8dac71795 100644 --- a/x/globalfee/ante/antetest/fee_test.go +++ b/x/globalfee/ante/antetest/fee_test.go @@ -16,8 +16,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - gaiafeeante "github.com/neutron-org/neutron/v4/x/globalfee/ante" - globfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" + gaiafeeante "github.com/neutron-org/neutron/v5/x/globalfee/ante" + globfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" ) var testGasLimit uint64 = 200_000 diff --git a/x/globalfee/ante/antetest/fee_test_setup.go b/x/globalfee/ante/antetest/fee_test_setup.go index 45a49afdb..2adfa3256 100644 --- a/x/globalfee/ante/antetest/fee_test_setup.go +++ b/x/globalfee/ante/antetest/fee_test_setup.go @@ -3,9 +3,9 @@ package antetest import ( "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" - "github.com/neutron-org/neutron/v4/testutil" + "github.com/neutron-org/neutron/v5/testutil" "github.com/stretchr/testify/suite" @@ -17,10 +17,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - neutronapp "github.com/neutron-org/neutron/v4/app" - gaiaparams "github.com/neutron-org/neutron/v4/app/params" - gaiafeeante "github.com/neutron-org/neutron/v4/x/globalfee/ante" - globfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" + neutronapp "github.com/neutron-org/neutron/v5/app" + gaiaparams "github.com/neutron-org/neutron/v5/app/params" + gaiafeeante "github.com/neutron-org/neutron/v5/x/globalfee/ante" + globfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" ) type IntegrationTestSuite struct { diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index b80483e7e..01300368d 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -3,14 +3,14 @@ package ante import ( "fmt" - gaiaerrors "github.com/neutron-org/neutron/v4/x/globalfee/types" + gaiaerrors "github.com/neutron-org/neutron/v5/x/globalfee/types" "cosmossdk.io/math" tmstrings "github.com/cometbft/cometbft/libs/strings" - "github.com/neutron-org/neutron/v4/app/params" - globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper" + "github.com/neutron-org/neutron/v5/app/params" + globalfeekeeper "github.com/neutron-org/neutron/v5/x/globalfee/keeper" errorsmod "cosmossdk.io/errors" diff --git a/x/globalfee/ante/fee_utils.go b/x/globalfee/ante/fee_utils.go index 1eeb11f49..2917d6d41 100644 --- a/x/globalfee/ante/fee_utils.go +++ b/x/globalfee/ante/fee_utils.go @@ -3,7 +3,7 @@ package ante import ( errorsmod "cosmossdk.io/errors" - gaiaerrors "github.com/neutron-org/neutron/v4/x/globalfee/types" + gaiaerrors "github.com/neutron-org/neutron/v5/x/globalfee/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/globalfee/client/cli/query.go b/x/globalfee/client/cli/query.go index be422f555..7ac7f7d3f 100644 --- a/x/globalfee/client/cli/query.go +++ b/x/globalfee/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 6fb447d03..6d5a644d1 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" metrics2 "cosmossdk.io/store/metrics" - globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper" + globalfeekeeper "github.com/neutron-org/neutron/v5/x/globalfee/keeper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -21,8 +21,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - gaiaparams "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + gaiaparams "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/grpc_query.go b/x/globalfee/keeper/grpc_query.go index 957eb8a9c..9f8b06c16 100644 --- a/x/globalfee/keeper/grpc_query.go +++ b/x/globalfee/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/globalfee/keeper/grpc_query_params.go b/x/globalfee/keeper/grpc_query_params.go index 563b38b3d..bcaac8e2f 100644 --- a/x/globalfee/keeper/grpc_query_params.go +++ b/x/globalfee/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/globalfee/keeper/grpc_query_params_test.go b/x/globalfee/keeper/grpc_query_params_test.go index 3bd18c387..2b80d1e00 100644 --- a/x/globalfee/keeper/grpc_query_params_test.go +++ b/x/globalfee/keeper/grpc_query_params_test.go @@ -6,11 +6,11 @@ import ( "cosmossdk.io/math" sdktypes "github.com/cosmos/cosmos-sdk/types" - testkeeper "github.com/neutron-org/neutron/v4/testutil/globalfee/keeper" + testkeeper "github.com/neutron-org/neutron/v5/testutil/globalfee/keeper" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/globalfee/keeper/keeper.go b/x/globalfee/keeper/keeper.go index 9e5baca35..eda7a3843 100644 --- a/x/globalfee/keeper/keeper.go +++ b/x/globalfee/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) // Keeper of the globalfee store diff --git a/x/globalfee/keeper/migrations.go b/x/globalfee/keeper/migrations.go index ac0f41750..7090b13b2 100644 --- a/x/globalfee/keeper/migrations.go +++ b/x/globalfee/keeper/migrations.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v3 "github.com/neutron-org/neutron/v4/x/globalfee/migrations/v3" + v3 "github.com/neutron-org/neutron/v5/x/globalfee/migrations/v3" - v2 "github.com/neutron-org/neutron/v4/x/globalfee/migrations/v2" + v2 "github.com/neutron-org/neutron/v5/x/globalfee/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/globalfee/keeper/msg_server.go b/x/globalfee/keeper/msg_server.go index caea17934..662745004 100644 --- a/x/globalfee/keeper/msg_server.go +++ b/x/globalfee/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/globalfee/migrations/v2/migration.go b/x/globalfee/migrations/v2/migration.go index 070161b01..ac5160eec 100644 --- a/x/globalfee/migrations/v2/migration.go +++ b/x/globalfee/migrations/v2/migration.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) // MigrateStore performs in-place params migrations of diff --git a/x/globalfee/migrations/v2/v2_test/migration_test.go b/x/globalfee/migrations/v2/v2_test/migration_test.go index f9ecb4dec..46b01d5f1 100644 --- a/x/globalfee/migrations/v2/v2_test/migration_test.go +++ b/x/globalfee/migrations/v2/v2_test/migration_test.go @@ -19,8 +19,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - v2 "github.com/neutron-org/neutron/v4/x/globalfee/migrations/v2" - globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" + v2 "github.com/neutron-org/neutron/v5/x/globalfee/migrations/v2" + globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/migrations/v3/migration.go b/x/globalfee/migrations/v3/migration.go index 4855c9497..8cf308bf7 100644 --- a/x/globalfee/migrations/v3/migration.go +++ b/x/globalfee/migrations/v3/migration.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) // MigrateStore performs in-place params migrations diff --git a/x/globalfee/migrations/v3/v3_test/migration_test.go b/x/globalfee/migrations/v3/v3_test/migration_test.go index 3733258bc..40b7350ff 100644 --- a/x/globalfee/migrations/v3/v3_test/migration_test.go +++ b/x/globalfee/migrations/v3/v3_test/migration_test.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" metrics2 "cosmossdk.io/store/metrics" - v3 "github.com/neutron-org/neutron/v4/x/globalfee/migrations/v3" + v3 "github.com/neutron-org/neutron/v5/x/globalfee/migrations/v3" "github.com/stretchr/testify/require" @@ -21,7 +21,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types" + globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types" ) func TestMigrateStore(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index 2b85ce35f..5a5743b33 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -22,9 +22,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/globalfee/client/cli" - "github.com/neutron-org/neutron/v4/x/globalfee/keeper" - "github.com/neutron-org/neutron/v4/x/globalfee/types" + "github.com/neutron-org/neutron/v5/x/globalfee/client/cli" + "github.com/neutron-org/neutron/v5/x/globalfee/keeper" + "github.com/neutron-org/neutron/v5/x/globalfee/types" ) var ( diff --git a/x/globalfee/types/genesis.pb.go b/x/globalfee/types/genesis.pb.go index 349c454df..092d8780b 100644 --- a/x/globalfee/types/genesis.pb.go +++ b/x/globalfee/types/genesis.pb.go @@ -91,8 +91,8 @@ var fileDescriptor_015b3e8b7a7c65c5 = []byte{ 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x38, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x2f, 0xb5, 0xb4, 0xa4, 0x28, 0x3f, 0x4f, 0x37, 0xbf, 0x28, - 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd1, 0xaf, 0x40, 0xf2, 0x55, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, - 0x1b, 0xd8, 0xdd, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2c, 0xf5, 0x57, 0x87, 0x32, 0x01, + 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x40, 0xf2, 0x55, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, + 0x1b, 0xd8, 0xdd, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6d, 0xee, 0xdb, 0xe9, 0x32, 0x01, 0x00, 0x00, } diff --git a/x/globalfee/types/params.pb.go b/x/globalfee/types/params.pb.go index f6bc1a627..fe726838f 100644 --- a/x/globalfee/types/params.pb.go +++ b/x/globalfee/types/params.pb.go @@ -108,29 +108,29 @@ var fileDescriptor_f135cd41f9af437e = []byte{ // 402 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0xaa, 0xd3, 0x40, 0x14, 0x86, 0x13, 0x23, 0x17, 0x8c, 0x1b, 0x09, 0x17, 0x89, 0x97, 0x4b, 0x52, 0x22, 0x48, 0x41, - 0x6f, 0x86, 0xeb, 0x75, 0xe5, 0x32, 0x8a, 0xc5, 0x45, 0xb1, 0x94, 0xba, 0x71, 0x33, 0x9c, 0xc4, - 0xe9, 0x38, 0x98, 0xc9, 0x84, 0x9c, 0x49, 0x69, 0x96, 0xbe, 0x81, 0x0f, 0xe0, 0x13, 0xf8, 0x0c, - 0x3e, 0x40, 0x97, 0x5d, 0xba, 0x8a, 0xd2, 0xee, 0xba, 0xf4, 0x09, 0x24, 0x49, 0xab, 0x2d, 0xbd, - 0x5d, 0xe5, 0x70, 0xf2, 0xfd, 0xff, 0xf9, 0xcf, 0xcc, 0xd8, 0x8f, 0x39, 0x08, 0x20, 0x3c, 0x55, - 0x31, 0xa4, 0x53, 0xc6, 0xc8, 0xec, 0x3a, 0x66, 0x1a, 0xae, 0x49, 0x0e, 0x05, 0x48, 0x0c, 0xf3, - 0x42, 0x69, 0xe5, 0x3c, 0x6c, 0xa0, 0xf0, 0x1f, 0x14, 0x6e, 0xa1, 0x0b, 0x2f, 0x51, 0x28, 0x15, - 0x92, 0x18, 0xf0, 0xbf, 0x32, 0x51, 0x22, 0xeb, 0x74, 0x17, 0xe7, 0x5c, 0x71, 0xd5, 0x96, 0xa4, - 0xa9, 0xba, 0x6e, 0xf0, 0xcd, 0xb2, 0xcf, 0x46, 0xad, 0xbd, 0xf3, 0xc3, 0xb4, 0x1d, 0x29, 0x32, - 0x21, 0x4b, 0x49, 0x39, 0x20, 0xcd, 0x0b, 0x91, 0x30, 0x74, 0xcd, 0x9e, 0xd5, 0xbf, 0xff, 0xfc, - 0x32, 0xec, 0xec, 0xc3, 0xc6, 0x7e, 0x37, 0x33, 0x7c, 0xcd, 0x92, 0x57, 0x4a, 0x64, 0x51, 0xbe, - 0xa8, 0x7d, 0x63, 0x53, 0xfb, 0x97, 0xc7, 0xfa, 0x67, 0x4a, 0x0a, 0xcd, 0x64, 0xae, 0xab, 0x3f, - 0xb5, 0xff, 0xa8, 0x02, 0x99, 0xbe, 0x0c, 0x8e, 0xa9, 0xe0, 0xfb, 0x2f, 0xff, 0x29, 0x17, 0xfa, - 0x53, 0x19, 0x87, 0x89, 0x92, 0x64, 0xbb, 0x4b, 0xf7, 0xb9, 0xc2, 0x8f, 0x9f, 0x89, 0xae, 0x72, - 0x86, 0xbb, 0x81, 0x38, 0x7e, 0xb0, 0xf5, 0x18, 0x00, 0x8e, 0x5a, 0x07, 0xe7, 0x8b, 0x69, 0xbb, - 0x71, 0x95, 0x03, 0x22, 0x95, 0x22, 0xa3, 0x53, 0xc6, 0xa8, 0x44, 0x4e, 0x5b, 0x9d, 0x7b, 0xa7, - 0x67, 0xf5, 0xef, 0x45, 0x6f, 0x37, 0xb5, 0x1f, 0x9c, 0x62, 0x0e, 0x82, 0xfa, 0x5d, 0xd0, 0x53, - 0x6c, 0x30, 0x3e, 0xef, 0x7e, 0x0d, 0x45, 0xf6, 0x86, 0xb1, 0x21, 0xf2, 0x49, 0xd3, 0x76, 0xde, - 0xd9, 0x4f, 0x24, 0xcc, 0xa9, 0x56, 0x1a, 0x52, 0x7a, 0x8b, 0xb8, 0x59, 0xb8, 0x44, 0xe0, 0xcc, - 0xb5, 0x7a, 0x66, 0xff, 0xee, 0xd8, 0x97, 0x30, 0x9f, 0x34, 0x70, 0x74, 0xe8, 0x36, 0x00, 0x7c, - 0xdf, 0x60, 0xd1, 0x70, 0xb1, 0xf2, 0xcc, 0xe5, 0xca, 0x33, 0x7f, 0xaf, 0x3c, 0xf3, 0xeb, 0xda, - 0x33, 0x96, 0x6b, 0xcf, 0xf8, 0xb9, 0xf6, 0x8c, 0x0f, 0x37, 0x7b, 0xa7, 0x95, 0xb1, 0x52, 0x17, - 0x2a, 0xbb, 0x52, 0x05, 0xdf, 0xd5, 0x64, 0xf6, 0x82, 0xcc, 0xf7, 0x9e, 0x52, 0x1b, 0x3b, 0x3e, - 0x6b, 0x2f, 0xfd, 0xe6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x73, 0xc7, 0xec, 0x69, 0x02, + 0x6f, 0x86, 0xeb, 0xc5, 0x8d, 0xcb, 0x28, 0x16, 0x17, 0xc5, 0x52, 0xea, 0xc6, 0xcd, 0x70, 0x12, + 0xa7, 0xe3, 0x60, 0x26, 0x13, 0x72, 0x26, 0xa5, 0x59, 0xfa, 0x06, 0x3e, 0x80, 0x4f, 0xe0, 0x33, + 0xf8, 0x00, 0x5d, 0x76, 0xe9, 0x2a, 0x4a, 0xbb, 0xeb, 0xd2, 0x27, 0x90, 0x24, 0xad, 0xb6, 0xf4, + 0x76, 0x95, 0xc3, 0xc9, 0xf7, 0xff, 0xe7, 0x3f, 0x33, 0x63, 0x3f, 0xe6, 0x20, 0x80, 0xf0, 0x54, + 0xc5, 0x90, 0x4e, 0x19, 0x23, 0xb3, 0xeb, 0x98, 0x69, 0xb8, 0x26, 0x39, 0x14, 0x20, 0x31, 0xcc, + 0x0b, 0xa5, 0x95, 0xf3, 0xb0, 0x81, 0xc2, 0x7f, 0x50, 0xb8, 0x85, 0x2e, 0xbc, 0x44, 0xa1, 0x54, + 0x48, 0x62, 0xc0, 0xff, 0xca, 0x44, 0x89, 0xac, 0xd3, 0x5d, 0x9c, 0x73, 0xc5, 0x55, 0x5b, 0x92, + 0xa6, 0xea, 0xba, 0xc1, 0x37, 0xcb, 0x3e, 0x1b, 0xb5, 0xf6, 0xce, 0x0f, 0xd3, 0x76, 0xa4, 0xc8, + 0x84, 0x2c, 0x25, 0xe5, 0x80, 0x34, 0x2f, 0x44, 0xc2, 0xd0, 0x35, 0x7b, 0x56, 0xff, 0xfe, 0xf3, + 0xcb, 0xb0, 0xb3, 0x0f, 0x1b, 0xfb, 0xdd, 0xcc, 0xf0, 0x35, 0x4b, 0x5e, 0x29, 0x91, 0x45, 0xf9, + 0xa2, 0xf6, 0x8d, 0x4d, 0xed, 0x5f, 0x1e, 0xeb, 0x9f, 0x29, 0x29, 0x34, 0x93, 0xb9, 0xae, 0xfe, + 0xd4, 0xfe, 0xa3, 0x0a, 0x64, 0xfa, 0x32, 0x38, 0xa6, 0x82, 0xef, 0xbf, 0xfc, 0xa7, 0x5c, 0xe8, + 0x4f, 0x65, 0x1c, 0x26, 0x4a, 0x92, 0xed, 0x2e, 0xdd, 0xe7, 0x0a, 0x3f, 0x7e, 0x26, 0xba, 0xca, + 0x19, 0xee, 0x06, 0xe2, 0xf8, 0xc1, 0xd6, 0x63, 0x00, 0x38, 0x6a, 0x1d, 0x9c, 0x2f, 0xa6, 0xed, + 0xc6, 0x55, 0x0e, 0x88, 0x54, 0x8a, 0x8c, 0x4e, 0x19, 0xa3, 0x12, 0x39, 0x6d, 0x75, 0xee, 0x9d, + 0x9e, 0xd5, 0xbf, 0x17, 0xbd, 0xdd, 0xd4, 0x7e, 0x70, 0x8a, 0x39, 0x08, 0xea, 0x77, 0x41, 0x4f, + 0xb1, 0xc1, 0xf8, 0xbc, 0xfb, 0x35, 0x14, 0xd9, 0x1b, 0xc6, 0x86, 0xc8, 0x27, 0x4d, 0xdb, 0x79, + 0x67, 0x3f, 0x91, 0x30, 0xa7, 0x5a, 0x69, 0x48, 0xe9, 0x2d, 0xe2, 0x66, 0xe1, 0x12, 0x81, 0x33, + 0xd7, 0xea, 0x99, 0xfd, 0xbb, 0x63, 0x5f, 0xc2, 0x7c, 0xd2, 0xc0, 0xd1, 0xa1, 0xdb, 0x00, 0xf0, + 0x7d, 0x83, 0x45, 0xc3, 0xc5, 0xca, 0x33, 0x97, 0x2b, 0xcf, 0xfc, 0xbd, 0xf2, 0xcc, 0xaf, 0x6b, + 0xcf, 0x58, 0xae, 0x3d, 0xe3, 0xe7, 0xda, 0x33, 0x3e, 0xdc, 0xec, 0x9d, 0x56, 0xc6, 0x4a, 0x5d, + 0xa8, 0xec, 0x4a, 0x15, 0x7c, 0x57, 0x93, 0xd9, 0x0b, 0x32, 0xdf, 0x7b, 0x4a, 0x6d, 0xec, 0xf8, + 0xac, 0xbd, 0xf4, 0x9b, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x68, 0x4b, 0x82, 0x69, 0x02, 0x00, 0x00, } diff --git a/x/globalfee/types/query.pb.go b/x/globalfee/types/query.pb.go index 1f802433c..b3c41c2c8 100644 --- a/x/globalfee/types/query.pb.go +++ b/x/globalfee/types/query.pb.go @@ -140,8 +140,8 @@ var fileDescriptor_12a736cede25d10a = []byte{ 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0xa5, 0x96, 0x96, 0x14, 0xe5, 0xe7, 0xe9, 0xe6, 0x17, - 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0x26, 0xfa, 0x15, 0x48, 0xe6, 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, - 0xb1, 0x81, 0x83, 0xd5, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x30, 0xe5, 0x3b, 0xc3, 0xed, 0x01, + 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0x48, 0xe6, 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, + 0xb1, 0x81, 0x83, 0xd5, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x71, 0xfe, 0xb7, 0xad, 0xed, 0x01, 0x00, 0x00, } diff --git a/x/globalfee/types/tx.pb.go b/x/globalfee/types/tx.pb.go index 31da98227..961f4d490 100644 --- a/x/globalfee/types/tx.pb.go +++ b/x/globalfee/types/tx.pb.go @@ -159,9 +159,9 @@ var fileDescriptor_1b7ff262ac5784d9 = []byte{ 0xf2, 0x88, 0x93, 0xef, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0xa5, 0x96, 0x96, 0x14, 0xe5, - 0xe7, 0xe9, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0x26, 0xfa, 0x15, 0x48, 0x71, 0x58, 0x52, - 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x25, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, - 0xc9, 0x07, 0xad, 0x62, 0x02, 0x00, 0x00, + 0xe7, 0xe9, 0xe6, 0x17, 0xa5, 0xc3, 0xd8, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0x48, 0x71, 0x58, 0x52, + 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x25, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc9, + 0xd2, 0x8b, 0xc3, 0x62, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc-hooks/bytecode/rate_limiter.wasm b/x/ibc-hooks/bytecode/rate_limiter.wasm new file mode 100644 index 000000000..7627ff34c Binary files /dev/null and b/x/ibc-hooks/bytecode/rate_limiter.wasm differ diff --git a/x/ibc-hooks/client/cli/query.go b/x/ibc-hooks/client/cli/query.go index 90da41aa0..8fb1c718d 100644 --- a/x/ibc-hooks/client/cli/query.go +++ b/x/ibc-hooks/client/cli/query.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/utils" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/utils" "github.com/cosmos/cosmos-sdk/client" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/types" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/types" "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ibc-hooks/ibc_middleware_test.go b/x/ibc-hooks/ibc_middleware_test.go index 0291417f9..7deb43ce7 100644 --- a/x/ibc-hooks/ibc_middleware_test.go +++ b/x/ibc-hooks/ibc_middleware_test.go @@ -15,10 +15,10 @@ import ( ibctesting "github.com/cosmos/ibc-go/v8/testing" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/testutils" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/utils" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/testutils" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/utils" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck @@ -47,11 +47,11 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() { expPass bool }{ {"override", func(status *testutils.Status) { - suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule. + suite.GetNeutronZoneApp(suite.ChainB).TransferStack. ICS4Middleware.Hooks = testutils.TestRecvOverrideHooks{Status: status} }, true}, {"before and after", func(status *testutils.Status) { - suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule. + suite.GetNeutronZoneApp(suite.ChainB).TransferStack. ICS4Middleware.Hooks = testutils.TestRecvBeforeAfterHooks{Status: status} }, true}, } @@ -87,7 +87,7 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() { data := transfertypes.NewFungibleTokenPacketData(trace.GetFullDenomPath(), amount.String(), suite.ChainA.SenderAccount.GetAddress().String(), receiver, "") packet := channeltypes.NewPacket(data.GetBytes(), seq, suite.TransferPath.EndpointA.ChannelConfig.PortID, suite.TransferPath.EndpointA.ChannelID, suite.TransferPath.EndpointB.ChannelConfig.PortID, suite.TransferPath.EndpointB.ChannelID, clienttypes.NewHeight(1, 100), 0) - ack := suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule. + ack := suite.GetNeutronZoneApp(suite.ChainB).TransferStack. OnRecvPacket(suite.ChainB.GetContext(), packet, suite.ChainA.SenderAccount.GetAddress()) if tc.expPass { @@ -96,14 +96,14 @@ func (suite *HooksTestSuite) TestOnRecvPacketHooks() { suite.Require().False(ack.Success()) } - if _, ok := suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule. + if _, ok := suite.GetNeutronZoneApp(suite.ChainB).TransferStack. ICS4Middleware.Hooks.(testutils.TestRecvOverrideHooks); ok { suite.Require().True(status.OverrideRan) suite.Require().False(status.BeforeRan) suite.Require().False(status.AfterRan) } - if _, ok := suite.GetNeutronZoneApp(suite.ChainB).HooksTransferIBCModule. + if _, ok := suite.GetNeutronZoneApp(suite.ChainB).TransferStack. ICS4Middleware.Hooks.(testutils.TestRecvBeforeAfterHooks); ok { suite.Require().False(status.OverrideRan) suite.Require().True(status.BeforeRan) diff --git a/x/ibc-hooks/ics4_middleware.go b/x/ibc-hooks/ics4_middleware.go index 29f8dd4c4..6e5d72d0b 100644 --- a/x/ibc-hooks/ics4_middleware.go +++ b/x/ibc-hooks/ics4_middleware.go @@ -7,7 +7,7 @@ import ( capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck - "github.com/neutron-org/neutron/v4/x/ibc-hooks/types" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/types" // ibc-go channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" diff --git a/x/ibc-hooks/sdkmodule.go b/x/ibc-hooks/sdkmodule.go index ee71c4c73..248b61057 100644 --- a/x/ibc-hooks/sdkmodule.go +++ b/x/ibc-hooks/sdkmodule.go @@ -12,8 +12,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/client/cli" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/types" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/client/cli" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/types" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/ibc-hooks/testutils/testing_hooks.go b/x/ibc-hooks/testutils/testing_hooks.go index ccfdd6bd5..3d7f29dd7 100644 --- a/x/ibc-hooks/testutils/testing_hooks.go +++ b/x/ibc-hooks/testutils/testing_hooks.go @@ -8,7 +8,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" - ibchooks "github.com/neutron-org/neutron/v4/x/ibc-hooks" + ibchooks "github.com/neutron-org/neutron/v5/x/ibc-hooks" ) var ( diff --git a/x/ibc-hooks/utils/utils.go b/x/ibc-hooks/utils/utils.go index 11e307889..44e4ed427 100644 --- a/x/ibc-hooks/utils/utils.go +++ b/x/ibc-hooks/utils/utils.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/types" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/types" sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" @@ -71,3 +71,13 @@ func DeriveIntermediateSender(channel, originalSender, bech32Prefix string) (str sender := sdk.AccAddress(senderHash32) return sdk.Bech32ifyAddressBytes(bech32Prefix, sender) } + +// IsAckError checks an IBC acknowledgement to see if it's an error. +// This is a replacement for ack.Success() which is currently not working on some circumstances +func IsAckError(acknowledgement []byte) bool { + var ackErr channeltypes.Acknowledgement_Error + if err := json.Unmarshal(acknowledgement, &ackErr); err == nil && len(ackErr.Error) > 0 { + return true + } + return false +} diff --git a/x/ibc-hooks/wasm_hook.go b/x/ibc-hooks/wasm_hook.go index c87d03faa..cbbd55054 100644 --- a/x/ibc-hooks/wasm_hook.go +++ b/x/ibc-hooks/wasm_hook.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/utils" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/utils" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -16,7 +16,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" - "github.com/neutron-org/neutron/v4/x/ibc-hooks/types" + "github.com/neutron-org/neutron/v5/x/ibc-hooks/types" ) type ContractAck struct { diff --git a/x/ibc-rate-limit/README.md b/x/ibc-rate-limit/README.md new file mode 100644 index 000000000..34165427e --- /dev/null +++ b/x/ibc-rate-limit/README.md @@ -0,0 +1,305 @@ +# IBC Rate Limit + +The IBC Rate Limit module is responsible for adding a governance-configurable rate limit to IBC transfers. +This is a safety control, intended to protect assets on Neutron in event of: + +* a bug/hack on Neutron +* a bug/hack on the counter-party chain +* a bug/hack in IBC itself + +This is done in exchange for a potential (one-way) bridge liveness tradeoff, in periods of high deposits or withdrawals. + +The architecture of this package is a minimal go package which implements an [IBC Middleware](https://github.com/cosmos/ibc-go/blob/f57170b1d4dd202a3c6c1c61dcf302b6a9546405/docs/ibc/middleware/develop.md) that wraps the [ICS20 transfer](https://ibc.cosmos.network/main/apps/transfer/overview.html) app, and calls into a cosmwasm contract. +The cosmwasm contract then has all of the actual IBC rate limiting logic. +The Cosmwasm code can be found in the [`contracts`](./contracts/) package, with bytecode findable in the [`bytecode`](./bytecode/) folder. The cosmwasm VM usage allows Neutron chain governance (Security SubDAI) to choose to change this safety control with no hard forks, via a parameter change proposal, a great mitigation for faster threat adaptavity. + +The status of the module is being in a state suitable for some initial governance settable rate limits for high value bridged assets. +Its not in its long term / end state for all channels by any means, but does act as a strong protection we +can instantiate today for high value IBC connections. + +## Motivation + +The motivation of IBC-rate-limit comes from the empirical observations of blockchain bridge hacks that a rate limit would have massively reduced the stolen amount of assets in: + +- [Polynetwork Bridge Hack ($611 million)](https://rekt.news/polynetwork-rekt/) +- [BNB Bridge Hack ($586 million)](https://rekt.news/bnb-bridge-rekt/) +- [Wormhole Bridge Hack ($326 million)](https://rekt.news/wormhole-rekt/) +- [Nomad Bridge Hack ($190 million)](https://rekt.news/nomad-rekt/) +- [Harmony Bridge Hack ($100 million)](https://rekt.news/harmony-rekt/) - (Would require rate limit + monitoring) +- [Dragonberry IBC bug](https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702) (can't yet disclose amount at risk, but was saved due to being found first by altruistic Neutron core developers) + +In the presence of a software bug on Neutron, IBC itself, or on a counterparty chain, we would like to prevent the bridge from being fully depegged. +This stems from the idea that a 30% asset depeg is ~infinitely better than a 100% depeg. +Its _crazy_ that today these complex bridged assets can instantly go to 0 in event of bug. +The goal of a rate limit is to raise an alert that something has potentially gone wrong, allowing validators and developers to have time to analyze, react, and protect larger portions of user funds. + +The thesis of this is that, it is worthwhile to sacrifice liveness in the case of legitimate demand to send extreme amounts of funds, to prevent the terrible long-tail full fund risks. +Rate limits aren't the end-all of safety controls, they're merely the simplest automated one. More should be explored and added onto IBC! + +## Rate limit types + +We express rate limits in time-based periods. +This means, we set rate limits for (say) 6-hour, daily, and weekly intervals. +The rate limit for a given time period stores the relevant amount of assets at the start of the rate limit. +Rate limits are then defined on percentage terms of the asset. +The time windows for rate limits are currently _not_ rolling, they have discrete start/end times. + +We allow setting separate rate limits for the inflow and outflow of assets. +We do all of our rate limits based on the _net flow_ of assets on a channel pair. This prevents DOS issues, of someone repeatedly sending assets back and forth, to trigger rate limits and break liveness. + +We currently envision creating two kinds of rate limits: + +* Per denomination rate limits + - allows safety statements like "Only 30% of Atom on Neutron can flow out in one day" or "The amount of Atom on Neutron can at most double per day". +* Per channel rate limits + - Limit the total inflow and outflow on a given IBC channel, based on "USDC" equivalent, using Neutron as the price oracle. + +We currently only implement per denomination rate limits for non-native assets. We do not yet implement channel based rate limits. + +Currently these rate limits automatically "expire" at the end of the quota duration. TODO: Think of better designs here. E.g. can we have a constant number of subsequent quotas start filled? Or perhaps harmonically decreasing amounts of next few quotas pre-filled? Halted until DAO override seems not-great. + +## Instantiating rate limits + +Today all rate limit quotas must be set manually by governance. +In the future, we should design towards some conservative rate limit to add as a safety-backstop automatically for channels. +Ideas for how this could look: + +* One month after a channel has been created, automatically add in some USDC-based rate limit +* One month after governance incentivizes an asset, add on a per-denomination rate limit. + +Definitely needs far more ideation and iteration! + +## Parameterizing the rate limit + +One element is we don't want any rate limit timespan that's too short, e.g. not enough time for humans to react to. So we wouldn't want a 1 hour rate limit, unless we think that if its hit, it could be assessed within an hour. + +### Handling rate limit boundaries + +We want to be safe against the case where say we have a daily rate limit ending at a given time, and an adversary attempts to attack near the boundary window. +We would not like them to be able to "double extract funds" by timing their extraction near a window boundary. + +Admittedly, not a lot of thought has been put into how to deal with this well. +Right now we envision simply handling this by saying if you want a quota of duration D, instead include two quotas of duration D, but offset by `D/2` from each other. + +Ideally we can change windows to be more 'rolling' in the future, to avoid this overhead and more cleanly handle the problem. (Perhaps rolling ~1 hour at a time) + +### Inflow parameterization + +The "Inflow" side of a rate limit is essentially protection against unforeseen bug on a counterparty chain. +This can be quite conservative (e.g. bridged amount doubling in one week). This covers a few cases: + +* Counter-party chain B having a token theft attack + - TODO: description of how this looks +* Counter-party chain B runaway mint + - TODO: description of how this looks +* IBC theft + - TODO: description of how this looks + +It does get more complex when the counterparty chain is itself a DEX, but this is still much more protection than nothing. + +### Outflow parameterization + +The "Outflow" side of a rate limit is protection against a bug on Neutron OR IBC. +This has potential for much more user-frustrating issues, if set too low. +E.g. if there's some event that causes many people to suddenly withdraw many STARS or many USDC. + +So this parameterization has to contend with being a tradeoff of withdrawal liveness in high volatility periods vs being a crucial safety rail, in event of on-Neutron bug. + +TODO: Better fill out + +### Example suggested parameterization + +## Code structure + +As mentioned at the beginning of the README, the go code is a relatively minimal ICS 20 wrapper, that dispatches relevant calls to a cosmwasm contract that implements the rate limiting functionality. + +### Go Middleware + +To achieve this, the middleware needs to implement the `porttypes.Middleware` interface and the +`porttypes.ICS4Wrapper` interface. This allows the middleware to send and receive IBC messages by wrapping +any IBC module, and be used as an ICS4 wrapper by a transfer module (for sending packets or writing acknowledgements). + +Of those interfaces, just the following methods have custom logic: + +* `ICS4Wrapper.SendPacket` forwards to contract, with intent of tracking of value sent via an ibc channel +* `Middleware.OnRecvPacket` forwards to contract, with intent of tracking of value received via an ibc channel +* `Middleware.OnAcknowledgementPacket` forwards to contract, with intent of undoing the tracking of a sent packet if the acknowledgment is not a success +* `OnTimeoutPacket` forwards to contract, with intent of undoing the tracking of a sent packet if the packet times out (is not relayed) + +All other methods from those interfaces are passthroughs to the underlying implementations. + +#### Parameters + +The middleware uses the following parameters: + +| Key | Type | +|-----------------|--------| +| ContractAddress | string | + +1. **ContractAddress** - + The contract address is the address of an instantiated version of the contract provided under `./contracts/` + +### Cosmwasm Contract Concepts + +Something to keep in mind with all of the code, is that we have to reason separately about every item in the following matrix: + +| Native Token | Non-Native Token | +|----------------------|--------------------------| +| Send Native Token | Send Non-Native Token | +| Receive Native Token | Receive Non-Native Token | +| Timeout Native Send | Timeout Non-native Send | + +(Error ACK can reuse the same code as timeout) + +TODO: Spend more time on sudo messages in the following description. We need to better describe how we map the quota concepts onto the code. +Need to describe how we get the quota beginning balance, and that its different for sends and receives. +Explain intracacies of tracking that a timeout and/or ErrorAck must appear from the same quota, else we ignore its update to the quotas. + + +The tracking contract uses the following concepts + +1. **RateLimit** - tracks the value flow transferred and the quota for a path. +2. **Path** - is a (denom, channel) pair. +3. **Flow** - tracks the value that has moved through a path during the current time window. +4. **Quota** - is the percentage of the denom's total value that can be transferred through the path in a given period of time (duration) + +#### Messages + +The contract specifies the following messages: + +##### Query + +* GetQuotas - Returns the quotas for a path + +##### Exec + +* AddPath - Adds a list of quotas for a path +* RemovePath - Removes a path +* ResetPathQuota - If a rate limit has been reached, the contract's governance address can reset the quota so that transfers are allowed again + +##### Sudo + +Sudo messages can only be executed by the chain. + +* SendPacket - Increments the amount used out of the send quota and checks that the send is allowed. If it isn't, it will return a RateLimitExceeded error +* RecvPacket - Increments the amount used out of the receive quota and checks that the receive is allowed. If it isn't, it will return a RateLimitExceeded error +* UndoSend - If a send has failed, the undo message is used to remove its cost from the send quota + +All of these messages receive the packet from the chain and extract the necessary information to process the packet and determine if it should be the rate limited. + +### Necessary information + +To determine if a packet should be rate limited, we need: + +* Channel: The channel on the Neutron side: `packet.SourceChannel` for sends, and `packet.DestinationChannel` for receives. +* Denom: The denom of the token being transferred as known on the Neutron side (more on that below) +* Channel Value: The total value of the channel denominated in `Denom` (i.e.: channel-17 is worth 10k osmo). +* Funds: the amount being transferred + +#### Notes on Channel +The contract also supports quotas on a custom channel called "any" that is checked on every transfer. If either the +transfer channel or the "any" channel have a quota that has been filled, the transaction will be rate limited. + +#### Notes on Denom +We always use the the denom as represented on Neutron. For native assets that is the local denom, and for non-native +assets it's the "ibc" prefix and the sha256 hash of the denom trace (`ibc/...`). + +##### Sends + +For native denoms, we can just use the denom in the packet. If the denom is invalid, it will fail somewhere else along the chain. Example result: `uosmo` + +For non-native denoms, the contract needs to hash the denom trace and append it to the `ibc/` prefix. The +contract always receives the parsed denom (i.e.: `transfer/channel-32/uatom` instead of +`ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2`). This is because of the order in which +the middleware is called. When sending a non-native denom, the packet contains `transfer/source-channel/denom` as it +is built on the `relay.SendTransfer()` in the transfer module and then passed to the middleware. Example result: `ibc/` + +##### Receives + +This behaves slightly different if the asset is an Neutron asset that was sent to the counterparty and is being +returned to the chain, or if the asset is being received by the chain and originates on the counterparty. In ibc this +is called being a "source" or a "sink" respectively. + +If the chain is a sink for the denom, we build the local denom by prefixing the port and the channel +(`transfer/local-channel`) and hashing that denom. Example result: `ibc/` + +If the chain is the source for the denom, there are two possibilities: + +* The token is a native token, in which case we just remove the prefix added by the counterparty. Example result: `uosmo` +* The token is a non-native token, in which case we remove the extra prefix and hash it. Example result `ibc/` + +#### Notes on Channel Value +We have iterated on different strategies for calculating the channel value. Our preferred strategy is the following: +* For non-native tokens (`ibc/...`), the channel value should be the supply of those tokens in Neutron +* For native tokens, the channel value should be the total amount of tokens in escrow across all ibc channels + +The later ensures the limits are lower and represent the amount of native tokens that exist outside Neutron. This is +beneficial as we assume the majority of native tokens exist on the native chain and the amount "normal" ibc transfers is +proportional to the tokens that have left the chain. + +This strategy cannot be implemented at the moment because IBC does not track the amount of tokens in escrow across +all channels ([github issue](https://github.com/cosmos/ibc-go/issues/2664)). Instead, we use the current supply on +Neutron for all denoms (i.e.: treat native and non-native tokens the same way). Once that ticket is fixed, we will +update this strategy. + +##### Caching + +The channel value varies constantly. To have better predictability, and avoid issues of the value growing if there is +a potential infinite mint bug, we cache the channel value at the beginning of the period for every quota. + +This means that if we have a daily quota of 1% of the osmo supply, and the channel value is 1M osmo at the beginning of +the quota, no more than 100k osmo can transferred during that day. If 10M osmo were to be minted or IBC'd in during that +period, the quota will not increase until the period expired. Then it will be 1% of the new channel value (~11M) + +### Integration + +The rate limit middleware wraps the `transferIBCModule` and is added as the entry route for IBC transfers. + +The module is also provided to the underlying `transferIBCModule` as its `ICS4Wrapper`; previously, this would have +pointed to a channel, which also implements the `ICS4Wrapper` interface. + +## Testing strategy + + +A general testing strategy is as follows: + +* Setup two chains. +* Send some tokens from A->B and some from B->A (so that there are IBC tokens to play with in both sides) +* Add the rate limiter on A with low limits (i.e. 1% of supply) +* Test Function for chains A' and B' and denom d + * Send some d tokens from A' to B' and get close to the limit. + * Do the same transfer making sure the amount is above the quota and verify it fails with the rate limit error + * Wait until the reset time has passed, and send again. The transfer should now succeed +* Repeat the above test for the following combination of chains and tokens: `(A,B,a)`, `(B,A,a)`, `(A,B,b)`, `(B,A,b)`, + where `a` and `b` are native tokens to chains A and B respectively. + +For more comprehensive tests we can also: +* Add a third chain C and make sure everything works properly for C tokens that have been transferred to A and to B +* Test that the contracts gov address can reset rate limits if the quota has been hit +* Test the queries for getting information about the state of the quotas +* Test that rate limit symmetries hold (i.e.: sending the a token through a rate-limited channel and then sending back + reduces the rate limits by the same amount that it was increased during the first send) +* Ensure that the channels between the test chains have different names (A->B="channel-0", B->A="channel-1", for example) + +## Known Future work + +Items that have been highlighted above: + +* Making automated rate limits get added for channels, instead of manual configuration only +* Improving parameterization strategies / data analysis +* Adding the USDC based rate limits +* We need better strategies for how rate limits "expire". + +Not yet highlighted + +* Making monitoring tooling to know when approaching rate limiting and when they're hit +* Making tooling to easily give us summaries we can use, to reason about "bug or not bug" in event of rate limit being hit +* Enabling ways to pre-declare large transfers so as to not hit rate limits. + * Perhaps you can on-chain declare intent to send these assets with a large delay, that raises monitoring but bypasses rate limits? + * Maybe contract-based tooling to split up the transfer suffices? +* Strategies to account for high volatility periods without hitting rate limits + * Can imagine "Hop network" style markets emerging + * Could imagine tieng it into looking at AMM volatility, or off-chain oracles + * but these are both things we should be wary of security bugs in. + * Maybe [constraint based programming with tracking of provenance](https://youtu.be/HB5TrK7A4pI?t=2852) as a solution +* Analyze changing denom-based rate limits, to just overall withdrawal amount for Neutron diff --git a/x/ibc-rate-limit/bytecode/rate_limiter.wasm b/x/ibc-rate-limit/bytecode/rate_limiter.wasm new file mode 100644 index 000000000..7627ff34c Binary files /dev/null and b/x/ibc-rate-limit/bytecode/rate_limiter.wasm differ diff --git a/x/ibc-rate-limit/client/cli/query.go b/x/ibc-rate-limit/client/cli/query.go new file mode 100644 index 000000000..50126ff5d --- /dev/null +++ b/x/ibc-rate-limit/client/cli/query.go @@ -0,0 +1,55 @@ +package cli + +import ( + "fmt" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" + "github.com/spf13/cobra" +) + +// GetQueryCmd returns the cli query commands for this module +func GetQueryCmd() *cobra.Command { + // Group ibc-rate-limit queries under a subcommand + cmd := &cobra.Command{ + Use: types.ModuleName, + Short: fmt.Sprintf("Querying commands for the %s module", types.ModuleName), + DisableFlagParsing: true, + SuggestionsMinimumDistance: 2, + RunE: client.ValidateCmd, + } + + cmd.AddCommand( + GetParams(), + ) + + return nil +} + +// GetParams returns the params for the module +func GetParams() *cobra.Command { + cmd := &cobra.Command{ + Use: "params [flags]", + Short: "Get the params for the x/ibc-rate-limit module", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, _ []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + + res, err := queryClient.Params(cmd.Context(), &types.QueryParamsRequest{}) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/ibc-rate-limit/genesis.go b/x/ibc-rate-limit/genesis.go new file mode 100644 index 000000000..938943b59 --- /dev/null +++ b/x/ibc-rate-limit/genesis.go @@ -0,0 +1,23 @@ +package ibcratelimit + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +// InitGenesis initializes the x/ibc-rate-limit module's state from a provided genesis +// state, which includes the parameter for the contract address. +func (i *ICS4Wrapper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { + err := i.IbcratelimitKeeper.SetParams(ctx, genState.Params) + if err != nil { + panic(err) + } +} + +// ExportGenesis returns the x/ibc-rate-limit module's exported genesis. +func (i *ICS4Wrapper) ExportGenesis(ctx sdk.Context) *types.GenesisState { + return &types.GenesisState{ + Params: i.GetParams(ctx), + } +} diff --git a/x/ibc-rate-limit/genesis_test.go b/x/ibc-rate-limit/genesis_test.go new file mode 100644 index 000000000..c2bd546f8 --- /dev/null +++ b/x/ibc-rate-limit/genesis_test.go @@ -0,0 +1,43 @@ +package ibcratelimit_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" + "github.com/stretchr/testify/suite" + + "github.com/neutron-org/neutron/v5/testutil/apptesting" +) + +type GenesisTestSuite struct { + apptesting.KeeperTestHelper +} + +func TestGenesisTestSuite(t *testing.T) { + suite.Run(t, new(GenesisTestSuite)) +} + +func (suite *GenesisTestSuite) SetupTest() { + suite.Setup() +} + +func (suite *GenesisTestSuite) TestInitExportGenesis() { + testAddress := sdk.AccAddress([]byte("addr1_______________")).String() + suite.SetupTest() + k := suite.App.RateLimitingICS4Wrapper + + initialGenesis := types.GenesisState{ + Params: types.Params{ + ContractAddress: testAddress, + }, + } + + k.InitGenesis(suite.Ctx, initialGenesis) + + suite.Require().Equal(testAddress, k.GetParams(suite.Ctx).ContractAddress) + + exportedGenesis := k.ExportGenesis(suite.Ctx) + + suite.Require().Equal(initialGenesis, *exportedGenesis) +} diff --git a/x/ibc-rate-limit/ibc_middleware_test.go b/x/ibc-rate-limit/ibc_middleware_test.go new file mode 100644 index 000000000..e70f2815f --- /dev/null +++ b/x/ibc-rate-limit/ibc_middleware_test.go @@ -0,0 +1,760 @@ +package ibcratelimit_test + +import ( + "fmt" + "strconv" + "strings" + "testing" + "time" + + sdkmath "cosmossdk.io/math" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/stretchr/testify/require" + "golang.org/x/exp/slices" + + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + + abci "github.com/cometbft/cometbft/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" + transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + ibctesting "github.com/cosmos/ibc-go/v8/testing" + "github.com/stretchr/testify/suite" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +type MiddlewareTestSuite struct { + testutil.IBCConnectionTestSuite +} + +const channelTest = "channel-2" + +// Setup +func TestMiddlewareTestSuite(t *testing.T) { + suite.Run(t, new(MiddlewareTestSuite)) +} + +// Helpers +func (suite *MiddlewareTestSuite) MessageFromAToB(denom string, amount sdkmath.Int) sdk.Msg { + coin := sdk.NewCoin(denom, amount) + port := suite.TransferPath.EndpointA.ChannelConfig.PortID + channel := suite.TransferPath.EndpointA.ChannelID + accountFrom := suite.ChainA.SenderAccount.GetAddress().String() + accountTo := suite.ChainB.SenderAccount.GetAddress().String() + timeoutHeight := clienttypes.NewHeight(10, 100) + return transfertypes.NewMsgTransfer( + port, + channel, + coin, + accountFrom, + accountTo, + timeoutHeight, + uint64(time.Now().UnixNano()), + "", + ) +} + +func (suite *MiddlewareTestSuite) MessageFromBToA(denom string, amount sdkmath.Int) sdk.Msg { + coin := sdk.NewCoin(denom, amount) + port := suite.TransferPath.EndpointB.ChannelConfig.PortID + channel := suite.TransferPath.EndpointB.ChannelID + accountFrom := suite.ChainB.SenderAccount.GetAddress().String() + accountTo := suite.ChainA.SenderAccount.GetAddress().String() + timeoutHeight := clienttypes.NewHeight(10, 100) + return transfertypes.NewMsgTransfer( + port, + channel, + coin, + accountFrom, + accountTo, + timeoutHeight, + uint64(time.Now().UnixNano()), + "", + ) +} + +func (suite *MiddlewareTestSuite) MessageFromAToC(denom string, amount sdkmath.Int) sdk.Msg { + coin := sdk.NewCoin(denom, amount) + port := suite.TransferPathAC.EndpointA.ChannelConfig.PortID + channel := suite.TransferPathAC.EndpointA.ChannelID + accountFrom := suite.ChainA.SenderAccount.GetAddress().String() + accountTo := suite.ChainC.SenderAccount.GetAddress().String() + timeoutHeight := clienttypes.NewHeight(10, 100) + return transfertypes.NewMsgTransfer( + port, + channel, + coin, + accountFrom, + accountTo, + timeoutHeight, + uint64(time.Now().UnixNano()), + "", + ) +} + +func CalculateChannelValue(ctx sdk.Context, denom string, bankKeeper bankkeeper.Keeper) sdkmath.Int { + return bankKeeper.GetSupply(ctx, denom).Amount +} + +func (suite *MiddlewareTestSuite) FullSendBToA(msg sdk.Msg) (*abci.ExecTxResult, string, error) { + sendResult, err := suite.SendMsgsNoCheck(suite.ChainB, msg) + suite.Require().NoError(err) + + packet, err := ibctesting.ParsePacketFromEvents(sendResult.GetEvents()) + suite.Require().NoError(err) + + err = suite.TransferPath.EndpointA.UpdateClient() + suite.Require().NoError(err) + + res, err := suite.TransferPath.EndpointA.RecvPacketWithResult(packet) + suite.Require().NoError(err) + + ack, err := ibctesting.ParseAckFromEvents(res.GetEvents()) + suite.Require().NoError(err) + + err = suite.TransferPath.EndpointA.UpdateClient() + suite.Require().NoError(err) + err = suite.TransferPath.EndpointB.UpdateClient() + suite.Require().NoError(err) + + return sendResult, string(ack), err +} + +func (suite *MiddlewareTestSuite) FullSendAToB(msg sdk.Msg) (*abci.ExecTxResult, string, error) { + sendResult, err := suite.SendMsgsNoCheck(suite.ChainA, msg) + if err != nil { + return nil, "", err + } + + packet, err := ibctesting.ParsePacketFromEvents(sendResult.GetEvents()) + if err != nil { + return nil, "", err + } + + err = suite.TransferPath.EndpointB.UpdateClient() + if err != nil { + return nil, "", err + } + + res, err := suite.TransferPath.EndpointB.RecvPacketWithResult(packet) + if err != nil { + return nil, "", err + } + ack, err := ibctesting.ParseAckFromEvents(res.GetEvents()) + if err != nil { + return nil, "", err + } + err = suite.TransferPath.EndpointA.UpdateClient() + if err != nil { + return nil, "", err + } + err = suite.TransferPath.EndpointB.UpdateClient() + if err != nil { + return nil, "", err + } + + return sendResult, string(ack), nil +} + +func (suite *MiddlewareTestSuite) FullSendAToC(msg sdk.Msg) (*abci.ExecTxResult, string, error) { + sendResult, err := suite.SendMsgsNoCheck(suite.ChainA, msg) + if err != nil { + return nil, "", err + } + + packet, err := ibctesting.ParsePacketFromEvents(sendResult.GetEvents()) + if err != nil { + return nil, "", err + } + + err = suite.TransferPathAC.EndpointB.UpdateClient() + if err != nil { + return nil, "", err + } + + res, err := suite.TransferPathAC.EndpointB.RecvPacketWithResult(packet) + if err != nil { + return nil, "", err + } + + ack, err := ibctesting.ParseAckFromEvents(res.GetEvents()) + if err != nil { + return nil, "", err + } + + err = suite.TransferPathAC.EndpointA.UpdateClient() + if err != nil { + return nil, "", err + } + err = suite.TransferPathAC.EndpointB.UpdateClient() + if err != nil { + return nil, "", err + } + + return sendResult, string(ack), nil +} + +func (suite *MiddlewareTestSuite) AssertReceive(success bool, msg sdk.Msg) (string, error) { + _, ack, err := suite.FullSendBToA(msg) + if success { + suite.Require().NoError(err) + suite.Require().NotContains(ack, "error", + "acknowledgment is an error") + } else { + suite.Require().Contains(ack, "error", + "acknowledgment is not an error") + suite.Require().Contains(ack, fmt.Sprintf("ABCI code: %d", types.ErrRateLimitExceeded.ABCICode()), + "acknowledgment error is not of the right type") + } + return ack, err +} + +func (suite *MiddlewareTestSuite) AssertSend(success bool, msg sdk.Msg) (*abci.ExecTxResult, error) { + r, _, err := suite.FullSendAToB(msg) + if success { + suite.Require().NoError(err, "IBC send failed. Expected success. %s", err) + } else { + suite.Require().Error(err, "IBC send succeeded. Expected failure") + suite.ErrorContains(err, types.ErrRateLimitExceeded.Error(), "Bad error type") + } + return r, err +} + +func (suite *MiddlewareTestSuite) BuildChannelQuota(name, channel, denom string, duration, sendPercentage, recvPercentage uint32) string { + return fmt.Sprintf(` + {"channel_id": "%s", "denom": "%s", "quotas": [{"name":"%s", "duration": %d, "send_recv":[%d, %d]}] } + `, channel, denom, name, duration, sendPercentage, recvPercentage) +} + +func (suite *MiddlewareTestSuite) BuildChannelQuotaWith2Quotas(name, channel, denom string, duration1 uint32, name2 string, sendPercentage1, recvPercentage1, duration2, sendPercentage2, recvPercentage2 uint32) string { + return fmt.Sprintf(` + {"channel_id": "%s", "denom": "%s", "quotas": [{"name":"%s", "duration": %d, "send_recv":[%d, %d]},{"name":"%s", "duration": %d, "send_recv":[%d, %d]}] } + `, channel, denom, name, duration1, sendPercentage1, recvPercentage1, name2, duration2, sendPercentage2, recvPercentage2) +} + +// Tests + +// Test that Sending IBC messages works when the middleware isn't configured +func (suite *MiddlewareTestSuite) TestSendTransferNoContract() { + suite.ConfigureTransferChannel() + one := sdkmath.NewInt(2) + _, err := suite.AssertSend(true, suite.MessageFromAToB(sdk.DefaultBondDenom, one)) + suite.Require().NoError(err) +} + +// Test that Receiving IBC messages works when the middleware isn't configured +func (suite *MiddlewareTestSuite) TestReceiveTransferNoContract() { + suite.ConfigureTransferChannel() + one := sdkmath.NewInt(2) + _, err := suite.AssertReceive(true, suite.MessageFromBToA(sdk.DefaultBondDenom, one)) + suite.Require().NoError(err) +} + +func (suite *MiddlewareTestSuite) initializeEscrow() { + app := suite.GetNeutronZoneApp(suite.ChainA) + supply := app.BankKeeper.GetSupply(suite.ChainA.GetContext(), sdk.DefaultBondDenom) + + // Move some funds from chainA to chainB so that there is something in escrow + // Each user has 10% of the supply, so we send most of the funds from one user to chainA + transferAmount := supply.Amount.QuoRaw(20) + + // When sending, the amount we're sending goes into escrow before we enter the middleware and thus + // it's used as part of the channel value in the rate limiting contract + // To account for that, we subtract the amount we'll send first (2.5% of transferAmount) here + sendAmount := transferAmount.QuoRaw(40) + + // Send from A to B + _, _, err := suite.FullSendAToB(suite.MessageFromAToB(sdk.DefaultBondDenom, transferAmount.Sub(sendAmount))) + suite.Require().NoError(err) + // Send from B to A + _, _, err = suite.FullSendBToA(suite.MessageFromBToA(sdk.DefaultBondDenom, transferAmount.Sub(sendAmount))) + suite.Require().NoError(err) +} + +func (suite *MiddlewareTestSuite) fullSendTest(native bool) map[string]string { + quotaPercentage := 5 + suite.initializeEscrow() + // Get the denom and amount to send + denom := sdk.DefaultBondDenom + if !native { + denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", channelTest, denom)) + denom = denomTrace.IBCDenom() + } + + app := suite.GetNeutronZoneApp(suite.ChainA) + + // This is the first one. Inside the tests. It works as expected. + channelValue := CalculateChannelValue(suite.ChainA.GetContext(), denom, app.BankKeeper) + + // The amount to be sent is send 2.5% (quota is 5%) + quota := channelValue.QuoRaw(int64(100 / quotaPercentage)) + sendAmount := quota.QuoRaw(2) + + // Setup contract + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + quotas := suite.BuildChannelQuota("weekly", channelTest, denom, 604800, 5, 5) + addr := suite.InstantiateRLContract(quotas) + suite.RegisterRateLimitingContract(addr) + + // send 2.5% (quota is 5%) + _, err := suite.AssertSend(true, suite.MessageFromAToB(denom, sendAmount)) + suite.Require().NoError(err) + + // send 2.5% (quota is 5%) + r, _ := suite.AssertSend(true, suite.MessageFromAToB(denom, sendAmount)) + + // Calculate remaining allowance in the quota + attrs := suite.ExtractAttributes(suite.FindEvent(r.GetEvents(), "wasm")) + + used, ok := sdkmath.NewIntFromString(attrs["weekly_used_out"]) + suite.Require().True(ok) + + suite.Require().Equal(used, sendAmount.MulRaw(2)) + + // Sending above the quota should fail. We use 2 instead of 1 here to avoid rounding issues + _, err = suite.AssertSend(false, suite.MessageFromAToB(denom, sdkmath.NewInt(2))) + suite.Require().Error(err) + return attrs +} + +// Test rate limiting on sends +func (suite *MiddlewareTestSuite) TestSendTransferWithRateLimitingNative() { + suite.ConfigureTransferChannel() + // Sends denom=stake from A->B. Rate limit receives "stake" in the packet. Nothing to do in the contract + suite.fullSendTest(true) +} + +// Test rate limiting on sends +func (suite *MiddlewareTestSuite) TestSendTransferWithRateLimitingNonNative() { + suite.ConfigureTransferChannel() + // Sends denom=ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878 from A->B. + // Rate limit receives "transfer/channel-0/stake" in the packet (because transfer.relay.SendTransfer is called before the middleware) + // and should hash it before calculating the value + suite.fullSendTest(false) +} + +// Test rate limits are reset when the specified time period has passed +func (suite *MiddlewareTestSuite) TestSendTransferReset() { + suite.ConfigureTransferChannel() + // Same test as above, but the quotas get reset after time passes + attrs := suite.fullSendTest(true) + parts := strings.Split(attrs["weekly_period_end"], ".") // Splitting timestamp into secs and nanos + secs, err := strconv.ParseInt(parts[0], 10, 64) + suite.Require().NoError(err) + nanos, err := strconv.ParseInt(parts[1], 10, 64) + suite.Require().NoError(err) + resetTime := time.Unix(secs, nanos) + + // Move chainA forward one block + suite.ChainA.NextBlock() + + // Reset time + one second + oneSecAfterReset := resetTime.Add(time.Second) + suite.Coordinator.IncrementTimeBy(oneSecAfterReset.Sub(suite.Coordinator.CurrentTime)) + + // Sending should succeed again + _, err = suite.AssertSend(true, suite.MessageFromAToB(sdk.DefaultBondDenom, sdkmath.NewInt(2))) + suite.Require().NoError(err) +} + +// Test rate while having 2 limits (daily & weekly). +// Daily is hit, wait until 'day' ends. Do this twice. Second iteration will hit the 'weekly' quota. +// Then we check that weekly rate limit still hits even after daily quota is refreshed. +func (suite *MiddlewareTestSuite) TestSendTransferDailyReset() { + suite.ConfigureTransferChannel() + quotaPercentage := 4 + suite.initializeEscrow() + // Get the denom and amount to send + denom := sdk.DefaultBondDenom + + app := suite.GetNeutronZoneApp(suite.ChainA) + + // This is the first one. Inside the tests. It works as expected. + channelValue := CalculateChannelValue(suite.ChainA.GetContext(), denom, app.BankKeeper) + + // The amount to be sent is 2% (weekly quota is 4%, daily is 2%) + quota := channelValue.QuoRaw(int64(100 / quotaPercentage)) + sendAmount := quota.QuoRaw(2) + + // Setup contract + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + quotas := suite.BuildChannelQuotaWith2Quotas("weekly", channelTest, denom, 604800, "daily", 4, 4, 86400, 2, 2) + addr := suite.InstantiateRLContract(quotas) + suite.RegisterRateLimitingContract(addr) + + // send 2% (daily quota is 2%) + r, err := suite.AssertSend(true, suite.MessageFromAToB(denom, sendAmount)) + suite.Require().NoError(err) + + // Calculate remaining allowance in the quota + attrs := suite.ExtractAttributes(suite.FindEvent(r.GetEvents(), "wasm")) + + used, ok := sdkmath.NewIntFromString(attrs["daily_used_out"]) + suite.Require().True(ok) + + suite.Require().Equal(used, sendAmount) + + weeklyUsed, ok := sdkmath.NewIntFromString(attrs["weekly_used_out"]) + suite.Require().True(ok) + suite.Require().Equal(weeklyUsed, sendAmount) + + // Sending above the daily quota should fail. + _, err = suite.AssertSend(false, suite.MessageFromAToB(denom, sendAmount)) + suite.Require().Error(err) + // Now we 'wait' until 'day' ends + parts := strings.Split(attrs["daily_period_end"], ".") // Splitting timestamp into secs and nanos + secs, err := strconv.ParseInt(parts[0], 10, 64) + suite.Require().NoError(err) + nanos, err := strconv.ParseInt(parts[1], 10, 64) + suite.Require().NoError(err) + resetTime := time.Unix(secs, nanos) + + // Move chainA forward one block + suite.ChainA.NextBlock() + + // Reset time + one second + oneSecAfterReset := resetTime.Add(time.Second) + suite.Coordinator.IncrementTimeBy(oneSecAfterReset.Sub(suite.Coordinator.CurrentTime)) + + // Sending should succeed again. It hits daily quota for the second time & weekly quota at the same time + r, err = suite.AssertSend(true, suite.MessageFromAToB(sdk.DefaultBondDenom, sendAmount)) + suite.Require().NoError(err) + + attrs = suite.ExtractAttributes(suite.FindEvent(r.GetEvents(), "wasm")) + + used, ok = sdkmath.NewIntFromString(attrs["daily_used_out"]) + suite.Require().True(ok) + + suite.Require().Equal(used, sendAmount) + + weeklyUsed, ok = sdkmath.NewIntFromString(attrs["weekly_used_out"]) + suite.Require().True(ok) + suite.Require().Equal(weeklyUsed, sendAmount.MulRaw(2)) + + parts = strings.Split(attrs["daily_period_end"], ".") // Splitting timestamp into secs and nanos + secs, err = strconv.ParseInt(parts[0], 10, 64) + suite.Require().NoError(err) + nanos, err = strconv.ParseInt(parts[1], 10, 64) + suite.Require().NoError(err) + resetTime = time.Unix(secs, nanos) + + // Move chainA forward one block + suite.ChainA.NextBlock() + + // Reset time + one second + oneSecAfterResetDayTwo := resetTime.Add(time.Second) + // Now we're waiting for the second 'day' to expire + suite.Coordinator.IncrementTimeBy(oneSecAfterResetDayTwo.Sub(suite.Coordinator.CurrentTime)) + + // Sending should fail. Daily quota is refreshed but weekly is over + _, err = suite.AssertSend(false, suite.MessageFromAToB(sdk.DefaultBondDenom, sdkmath.NewInt(2))) + suite.Require().Error(err) +} + +// Test rate limiting on receives +func (suite *MiddlewareTestSuite) fullRecvTest(native bool) { + quotaPercentage := 4 + suite.initializeEscrow() + // Get the denom and amount to send + sendDenom := sdk.DefaultBondDenom + localDenom := sdk.DefaultBondDenom + if native { + denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", channelTest, localDenom)) + localDenom = denomTrace.IBCDenom() + } else { + denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", channelTest, sendDenom)) + sendDenom = denomTrace.IBCDenom() + } + + app := suite.GetNeutronZoneApp(suite.ChainA) + + channelValue := CalculateChannelValue(suite.ChainA.GetContext(), localDenom, app.BankKeeper) + + // The amount to be sent is 2% (quota is 4%) + quota := channelValue.QuoRaw(int64(100 / quotaPercentage)) + sendAmount := quota.QuoRaw(2) + + // Setup contract + suite.GetNeutronZoneApp(suite.ChainA) + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + quotas := suite.BuildChannelQuota("weekly", channelTest, localDenom, 604800, 4, 4) + addr := suite.InstantiateRLContract(quotas) + suite.RegisterRateLimitingContract(addr) + + // receive 2.5% (quota is 5%) + _, err := suite.AssertReceive(true, suite.MessageFromBToA(sendDenom, sendAmount)) + suite.Require().NoError(err) + + // receive 2.5% (quota is 5%) + _, err = suite.AssertReceive(true, suite.MessageFromBToA(sendDenom, sendAmount)) + suite.Require().NoError(err) + + // Sending above the quota should fail. We send 2 instead of 1 to account for rounding errors + _, err = suite.AssertReceive(false, suite.MessageFromBToA(sendDenom, sdkmath.NewInt(20000))) + suite.Require().NoError(err) +} + +func (suite *MiddlewareTestSuite) TestRecvTransferWithRateLimitingNative() { + suite.ConfigureTransferChannel() + // Sends denom=stake from B->A. + // Rate limit receives "stake" in the packet and should wrap it before calculating the value + // types.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) should return false => Wrap the token + suite.fullRecvTest(true) +} + +func (suite *MiddlewareTestSuite) TestRecvTransferWithRateLimitingNonNative() { + suite.ConfigureTransferChannel() + // Sends denom=ibc/C053D637CCA2A2BA030E2C5EE1B28A16F71CCB0E45E8BE52766DC1B241B77878 from B->A. + // Rate limit receives "transfer/channel-0/stake" in the packet and should turn it into "stake" + // types.ReceiverChainIsSource(packet.GetSourcePort(), packet.GetSourceChannel(), data.Denom) should return true => unprefix. If unprefixed is not local, hash. + suite.fullRecvTest(false) +} + +// Test no rate limiting occurs when the contract is set, but no quotas are configured for the path +func (suite *MiddlewareTestSuite) TestSendTransferNoQuota() { + suite.ConfigureTransferChannel() + // Setup contract + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + addr := suite.InstantiateRLContract(``) + suite.RegisterRateLimitingContract(addr) + + // send 1 token. + // If the contract doesn't have a quota for the current channel, all transfers are allowed + _, err := suite.AssertSend(true, suite.MessageFromAToB(sdk.DefaultBondDenom, sdkmath.NewInt(1))) + suite.Require().NoError(err) +} + +// Test rate limits are reverted if a "send" fails +func (suite *MiddlewareTestSuite) TestFailedSendTransfer() { + suite.ConfigureTransferChannel() + suite.initializeEscrow() + // Setup contract + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + quotas := suite.BuildChannelQuota("weekly", channelTest, sdk.DefaultBondDenom, 604800, 1, 1) + addr := suite.InstantiateRLContract(quotas) + suite.RegisterRateLimitingContract(addr) + + // Get the escrowed amount + app := suite.GetNeutronZoneApp(suite.ChainA) + // ToDo: This is what we eventually want here, but using the full supply temporarily for performance reasons. See CalculateChannelValue + // escrowAddress := transfertypes.GetEscrowAddress("transfer", "channel-0") + // escrowed := app.BankKeeper.GetBalance(suite.chainA.GetContext(), escrowAddress, sdk.DefaultBondDenom) + escrowed := app.BankKeeper.GetSupply(suite.ChainA.GetContext(), sdk.DefaultBondDenom) + quota := escrowed.Amount.QuoRaw(100) // 1% of the escrowed amount + + // Use the whole quota + coins := sdk.NewCoin(sdk.DefaultBondDenom, quota) + port := suite.TransferPath.EndpointA.ChannelConfig.PortID + channel := suite.TransferPath.EndpointA.ChannelID + accountFrom := suite.ChainA.SenderAccount.GetAddress().String() + timeoutHeight := clienttypes.NewHeight(10, 100) + msg := transfertypes.NewMsgTransfer(port, channel, coins, accountFrom, "INVALID", timeoutHeight, 0, "") + + // Sending the message manually because AssertSend updates both clients. We need to update the clients manually + // for this test so that the failure to receive on chain B happens after the second packet is sent from chain A. + // That way we validate that chain A is blocking as expected, but the flow is reverted after the receive failure is + // acknowledged on chain A + res, err := suite.SendMsgsNoCheck(suite.ChainA, msg) + suite.Require().NoError(err) + + // Sending again fails as the quota is filled + _, err = suite.AssertSend(false, suite.MessageFromAToB(sdk.DefaultBondDenom, quota)) + suite.Require().Error(err) + + // Move forward one block + suite.ChainA.NextBlock() + suite.ChainA.Coordinator.IncrementTime() + + // Update both clients + err = suite.TransferPath.EndpointA.UpdateClient() + suite.Require().NoError(err) + err = suite.TransferPath.EndpointB.UpdateClient() + suite.Require().NoError(err) + + // Execute the acknowledgement from chain B in chain A + + // extract the sent packet + packet, err := ibctesting.ParsePacketFromEvents(res.GetEvents()) + suite.Require().NoError(err) + + // recv in chain b + newRes, err := suite.TransferPath.EndpointB.RecvPacketWithResult(packet) + suite.Require().NoError(err) + + // get the ack from the chain b's response + ack, err := ibctesting.ParseAckFromEvents(newRes.GetEvents()) + suite.Require().NoError(err) + + // manually relay it to chain a + err = suite.TransferPath.EndpointA.AcknowledgePacket(packet, ack) + suite.Require().NoError(err) + + // We should be able to send again because the packet that exceeded the quota failed and has been reverted + _, err = suite.AssertSend(true, suite.MessageFromAToB(sdk.DefaultBondDenom, sdkmath.NewInt(2))) + suite.Require().NoError(err) +} + +func (suite *MiddlewareTestSuite) TestUnsetRateLimitingContract() { + // Setup contract + suite.ConfigureTransferChannel() + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + addr := suite.InstantiateRLContract("") + suite.RegisterRateLimitingContract(addr) + + app := suite.GetNeutronZoneApp(suite.ChainA) + + // Unset the contract param + err := app.RateLimitingICS4Wrapper.IbcratelimitKeeper.SetParams(suite.ChainA.GetContext(), types.Params{ContractAddress: ""}) + suite.Require().NoError(err) + // N.B.: this panics if validation fails. +} + +// Test rate limits are reverted if a "send" fails +func (suite *MiddlewareTestSuite) TestNonICS20() { + suite.ConfigureTransferChannel() + suite.initializeEscrow() + // Setup contract + app := suite.GetNeutronZoneApp(suite.ChainA) + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + quotas := suite.BuildChannelQuota("weekly", "channel-0", sdk.DefaultBondDenom, 604800, 1, 1) + addr := suite.InstantiateRLContract(quotas) + suite.RegisterRateLimitingContract(addr) + + data := []byte("{}") + _, err := app.RateLimitingICS4Wrapper.SendPacket(suite.ChainA.GetContext(), capabilitytypes.NewCapability(1), "wasm.neutron1873ls0d60tg7hk00976teq9ywhzv45u3hk2urw8t3eau9eusa4eqtun9xn", "channel-0", clienttypes.NewHeight(0, 0), 1, data) + + suite.Require().Error(err) + // This will error out, but not because of rate limiting + suite.Require().NotContains(err.Error(), "rate limit") + suite.Require().Contains(err.Error(), "channel not found") +} + +func (suite *MiddlewareTestSuite) TestDenomRestrictionFlow() { + suite.ConfigureTransferChannel() + suite.ConfigureTransferChannelAC() + // Setup contract + testOwner := sdk.MustAccAddressFromBech32(testutil.TestOwnerAddress) + suite.StoreTestCode(suite.ChainA.GetContext(), testOwner, "./bytecode/rate_limiter.wasm") + quotas := suite.BuildChannelQuota("weekly", "channel-0", sdk.DefaultBondDenom, 604800, 1, 1) + contractAddr := suite.InstantiateRLContract(quotas) + suite.RegisterRateLimitingContract(contractAddr) + + denom := sdk.DefaultBondDenom + sendAmount := sdkmath.NewInt(2) + acceptedChannel := suite.TransferPath.EndpointA.ChannelID + + // Sending on a diff channel should work + _, _, err := suite.FullSendAToC(suite.MessageFromAToC(denom, sendAmount)) + suite.Require().NoError(err, "Send on alternative channel should work") + + // Successfully send a denom before any restrictions are added. + _, err = suite.AssertSend(true, suite.MessageFromAToB(denom, sendAmount)) + suite.Require().NoError(err, "Send should succeed without restrictions") + + // Add a restriction that only allows sending on the accepted channel + restrictionMsg := fmt.Sprintf(`{"set_denom_restrictions": {"denom":"%s","allowed_channels":["%s"]}}`, denom, acceptedChannel) + _, err = suite.ExecuteContract(contractAddr, testOwner, []byte(restrictionMsg), sdk.Coins{}) + suite.Require().NoError(err) + + // Sending on the accepted channel should succeed + _, err = suite.AssertSend(true, suite.MessageFromAToB(denom, sendAmount)) + suite.Require().NoError(err, "Send on accepted channel should succeed") + + // Sending on any other channel should fail + _, err = suite.AssertSend(false, suite.MessageFromAToC(denom, sendAmount)) + suite.Require().Error(err, "Send on blocked channel should fail") + + // Unset the restriction and verify that sending on other channels works again + unsetMsg := fmt.Sprintf(`{"unset_denom_restrictions": {"denom":"%s"}}`, denom) + _, err = suite.ExecuteContract(contractAddr, testOwner, []byte(unsetMsg), sdk.Coins{}) + suite.Require().NoError(err, "Unsetting denom restriction should succeed") + + // Sending again on the previously blocked channel should now succeed + _, _, err = suite.FullSendAToC(suite.MessageFromAToC(denom, sendAmount)) + suite.Require().NoError(err, "Send on previously blocked channel should succeed after unsetting restriction") +} + +func (suite *MiddlewareTestSuite) InstantiateRLContract(quotas string) sdk.AccAddress { + app := suite.GetNeutronZoneApp(suite.ChainA) + transferModule := app.AccountKeeper.GetModuleAddress(transfertypes.ModuleName) + initMsgBz := []byte(fmt.Sprintf(`{ + "gov_module": "%s", + "ibc_module":"%s", + "paths": [%s] + }`, + testutil.TestOwnerAddress, transferModule, quotas)) + + contractKeeper := wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper) + codeID := uint64(1) + creator := suite.ChainA.SenderAccount.GetAddress() + addr, _, err := contractKeeper.Instantiate(suite.ChainA.GetContext(), codeID, creator, creator, initMsgBz, "rate limiting contract", nil) + suite.Require().NoError(err) + return addr +} + +func (suite *MiddlewareTestSuite) InstantiateRLContract2Quotas(quotas1 string) sdk.AccAddress { + app := suite.GetNeutronZoneApp(suite.ChainA) + transferModule := app.AccountKeeper.GetModuleAddress(transfertypes.ModuleName) + initMsgBz := []byte(fmt.Sprintf(`{ + "gov_module": "%s", + "ibc_module":"%s", + "paths": [%s] + }`, + testutil.TestOwnerAddress, transferModule, quotas1)) + contractKeeper := wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper) + codeID := uint64(1) + creator := suite.ChainA.SenderAccount.GetAddress() + addr, _, err := contractKeeper.Instantiate(suite.ChainA.GetContext(), codeID, creator, creator, initMsgBz, "rate limiting contract", nil) + suite.Require().NoError(err) + return addr +} + +func (suite *MiddlewareTestSuite) RegisterRateLimitingContract(addr []byte) { + addrStr, _ := sdk.Bech32ifyAddressBytes("neutron", addr) + app := suite.GetNeutronZoneApp(suite.ChainA) + _ = app.RateLimitingICS4Wrapper.SetParams(suite.ChainA.GetContext(), types.Params{ContractAddress: addrStr}) + require.True(suite.ChainA.TB, true) +} + +// AssertEventEmitted asserts that ctx's event manager has emitted the given number of events +// of the given type. +func (suite *MiddlewareTestSuite) AssertEventEmitted(ctx sdk.Context, eventTypeExpected string, numEventsExpected int) { + allEvents := ctx.EventManager().Events() + // filter out other events + actualEvents := make([]sdk.Event, 0) + for _, event := range allEvents { + if event.Type == eventTypeExpected { + actualEvents = append(actualEvents, event) + } + } + suite.Require().Equal(numEventsExpected, len(actualEvents)) +} + +func (suite *MiddlewareTestSuite) FindEvent(events []abci.Event, name string) abci.Event { + index := slices.IndexFunc(events, func(e abci.Event) bool { return e.Type == name }) + if index == -1 { + return abci.Event{} + } + return events[index] +} + +func (suite *MiddlewareTestSuite) ExtractAttributes(event abci.Event) map[string]string { + attrs := make(map[string]string) + if event.Attributes == nil { + return attrs + } + for _, a := range event.Attributes { + attrs[a.Key] = a.Value + } + return attrs +} diff --git a/x/ibc-rate-limit/ibc_module.go b/x/ibc-rate-limit/ibc_module.go new file mode 100644 index 000000000..38b4349ca --- /dev/null +++ b/x/ibc-rate-limit/ibc_module.go @@ -0,0 +1,252 @@ +package ibcratelimit + +import ( + "encoding/json" + "strings" + + "github.com/neutron-org/neutron/v5/x/ibc-hooks/utils" + + errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v8/modules/core/exported" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +type IBCModule struct { + app porttypes.IBCModule + ics4Middleware *ICS4Wrapper +} + +func NewIBCModule(app porttypes.IBCModule, ics4 *ICS4Wrapper) IBCModule { + return IBCModule{ + app: app, + ics4Middleware: ics4, + } +} + +// OnChanOpenInit implements the IBCModule interface +func (im *IBCModule) OnChanOpenInit(ctx sdk.Context, + order channeltypes.Order, + connectionHops []string, + portID string, + channelID string, + channelCap *capabilitytypes.Capability, + counterparty channeltypes.Counterparty, + version string, +) (string, error) { + return im.app.OnChanOpenInit( + ctx, + order, + connectionHops, + portID, + channelID, + channelCap, + counterparty, + version, + ) +} + +// OnChanOpenTry implements the IBCModule interface +func (im *IBCModule) OnChanOpenTry( + ctx sdk.Context, + order channeltypes.Order, + connectionHops []string, + portID, + channelID string, + channelCap *capabilitytypes.Capability, + counterparty channeltypes.Counterparty, + counterpartyVersion string, +) (string, error) { + return im.app.OnChanOpenTry(ctx, order, connectionHops, portID, channelID, channelCap, counterparty, counterpartyVersion) +} + +// OnChanOpenAck implements the IBCModule interface +func (im *IBCModule) OnChanOpenAck( + ctx sdk.Context, + portID, + channelID string, + counterpartyChannelID string, + counterpartyVersion string, +) error { + // Here we can add initial limits when a new channel is open. For now, they can be added manually on the contract + return im.app.OnChanOpenAck(ctx, portID, channelID, counterpartyChannelID, counterpartyVersion) +} + +// OnChanOpenConfirm implements the IBCModule interface +func (im *IBCModule) OnChanOpenConfirm( + ctx sdk.Context, + portID, + channelID string, +) error { + // Here we can add initial limits when a new channel is open. For now, they can be added manually on the contract + return im.app.OnChanOpenConfirm(ctx, portID, channelID) +} + +// OnChanCloseInit implements the IBCModule interface +func (im *IBCModule) OnChanCloseInit( + ctx sdk.Context, + portID, + channelID string, +) error { + // Here we can remove the limits when a new channel is closed. For now, they can remove them manually on the contract + return im.app.OnChanCloseInit(ctx, portID, channelID) +} + +// OnChanCloseConfirm implements the IBCModule interface +func (im *IBCModule) OnChanCloseConfirm( + ctx sdk.Context, + portID, + channelID string, +) error { + // Here we can remove the limits when a new channel is closed. For now, they can remove them manually on the contract + return im.app.OnChanCloseConfirm(ctx, portID, channelID) +} + +type receiverParser struct { + Receiver string `protobuf:"bytes,4,opt,name=receiver,proto3" json:"receiver,omitempty"` +} + +func ValidateReceiverAddress(packet exported.PacketI) error { + var receiverObj receiverParser + + if err := json.Unmarshal(packet.GetData(), &receiverObj); err != nil { + return err + } + if len(receiverObj.Receiver) >= types.MaxSupportedIBCReceiverAddressLength { + return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "IBC Receiver address too long. Max supported length is %d", types.MaxSupportedIBCReceiverAddressLength) + } + return nil +} + +// OnRecvPacket implements the IBCModule interface +func (im *IBCModule) OnRecvPacket( + ctx sdk.Context, + packet channeltypes.Packet, + relayer sdk.AccAddress, +) exported.Acknowledgement { + if err := ValidateReceiverAddress(packet); err != nil { + return utils.NewEmitErrorAcknowledgement(ctx, types.ErrBadMessage, err.Error()) + } + + contract := im.ics4Middleware.GetContractAddress(ctx) + if contract == "" { + // The contract has not been configured. Continue as usual + return im.app.OnRecvPacket(ctx, packet, relayer) + } + + err := CheckAndUpdateRateLimits(ctx, im.ics4Middleware.ContractKeeper, msgRecv, contract, packet) + if err != nil { + if strings.Contains(err.Error(), types.RateLimitExceededSubStr) { + return utils.NewEmitErrorAcknowledgement(ctx, types.ErrRateLimitExceeded) + } + fullError := errorsmod.Wrap(types.ErrContractError, err.Error()) + return utils.NewEmitErrorAcknowledgement(ctx, fullError) + } + + // if this returns an Acknowledgement that isn't successful, all state changes are discarded + return im.app.OnRecvPacket(ctx, packet, relayer) +} + +// OnAcknowledgementPacket implements the IBCModule interface +func (im *IBCModule) OnAcknowledgementPacket( + ctx sdk.Context, + packet channeltypes.Packet, + acknowledgement []byte, + relayer sdk.AccAddress, +) error { + // Osmosis have some osmo-specific code here, but it disrupts proper work of neutron chain. + // See: https://github.com/osmosis-labs/osmosis/pull/8308 & https://github.com/osmosis-labs/osmosis/pull/8420 + var ack channeltypes.Acknowledgement + if err := json.Unmarshal(acknowledgement, &ack); err != nil { + return errorsmod.Wrapf(sdkerrors.ErrUnknownRequest, "cannot unmarshal ICS-20 transfer packet acknowledgement: %v", err) + } + + if utils.IsAckError(acknowledgement) { + err := im.RevertSentPacket(ctx, packet) // If there is an error here we should still handle the ack + if err != nil { + ctx.EventManager().EmitEvent( + sdk.NewEvent( + types.EventBadRevert, + sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), + sdk.NewAttribute(types.AttributeKeyFailureType, "acknowledgment"), + sdk.NewAttribute(types.AttributeKeyPacket, string(packet.GetData())), + sdk.NewAttribute(types.AttributeKeyAck, string(acknowledgement)), + ), + ) + } + } + + return im.app.OnAcknowledgementPacket(ctx, packet, acknowledgement, relayer) +} + +// OnTimeoutPacket implements the IBCModule interface +func (im *IBCModule) OnTimeoutPacket( + ctx sdk.Context, + packet channeltypes.Packet, + relayer sdk.AccAddress, +) error { + err := im.RevertSentPacket(ctx, packet) // If there is an error here we should still handle the timeout + if err != nil { + ctx.EventManager().EmitEvent( + sdk.NewEvent( + types.EventBadRevert, + sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), + sdk.NewAttribute(types.AttributeKeyFailureType, "timeout"), + sdk.NewAttribute(types.AttributeKeyPacket, string(packet.GetData())), + ), + ) + } + return im.app.OnTimeoutPacket(ctx, packet, relayer) +} + +// RevertSentPacket Notifies the contract that a sent packet wasn't properly received +func (im *IBCModule) RevertSentPacket( + ctx sdk.Context, + packet exported.PacketI, +) error { + contract := im.ics4Middleware.GetContractAddress(ctx) + if contract == "" { + // The contract has not been configured. Continue as usual + return nil + } + + return UndoSendRateLimit( + ctx, + im.ics4Middleware.ContractKeeper, + contract, + packet, + ) +} + +// SendPacket implements the ICS4 Wrapper interface +func (im *IBCModule) SendPacket( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + sourcePort, sourceChannel string, + timeoutHeight clienttypes.Height, + timeoutTimestamp uint64, + data []byte, +) (uint64, error) { + return im.ics4Middleware.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) +} + +// WriteAcknowledgement implements the ICS4 Wrapper interface +func (im *IBCModule) WriteAcknowledgement( + ctx sdk.Context, + chanCap *capabilitytypes.Capability, + packet exported.PacketI, + ack exported.Acknowledgement, +) error { + return im.ics4Middleware.WriteAcknowledgement(ctx, chanCap, packet, ack) +} + +func (im *IBCModule) GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool) { + return im.ics4Middleware.GetAppVersion(ctx, portID, channelID) +} diff --git a/x/ibc-rate-limit/ics4_wrapper.go b/x/ibc-rate-limit/ics4_wrapper.go new file mode 100644 index 000000000..41301ab86 --- /dev/null +++ b/x/ibc-rate-limit/ics4_wrapper.go @@ -0,0 +1,108 @@ +package ibcratelimit + +import ( + "encoding/json" + + errorsmod "cosmossdk.io/errors" + + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + sdk "github.com/cosmos/cosmos-sdk/types" + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" + "github.com/cosmos/ibc-go/v8/modules/core/exported" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +var ( + _ porttypes.Middleware = &IBCModule{} + _ porttypes.ICS4Wrapper = &ICS4Wrapper{} +) + +type ICS4Wrapper struct { + channel porttypes.ICS4Wrapper + accountKeeper *authkeeper.AccountKeeper + bankKeeper *bankkeeper.BaseKeeper + ContractKeeper *wasmkeeper.PermissionedKeeper + IbcratelimitKeeper *keeper.Keeper +} + +func (i *ICS4Wrapper) GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool) { + return i.channel.GetAppVersion(ctx, portID, channelID) +} + +func NewICS4Middleware( + channel porttypes.ICS4Wrapper, + accountKeeper *authkeeper.AccountKeeper, contractKeeper *wasmkeeper.PermissionedKeeper, + bankKeeper *bankkeeper.BaseKeeper, ibcratelimitkeeper *keeper.Keeper, +) ICS4Wrapper { + return ICS4Wrapper{ + channel: channel, + accountKeeper: accountKeeper, + ContractKeeper: contractKeeper, + bankKeeper: bankKeeper, + IbcratelimitKeeper: ibcratelimitkeeper, + } +} + +// SendPacket implements the ICS4 interface and is called when sending packets. +// This method retrieves the contract from the middleware's parameters and checks if the limits have been exceeded for +// the current transfer, in which case it returns an error preventing the IBC send from taking place. +// If the contract param is not configured, or the contract doesn't have a configuration for the (channel+denom) being +// used, transfers are not prevented and handled by the wrapped IBC app +func (i *ICS4Wrapper) SendPacket(ctx sdk.Context, chanCap *capabilitytypes.Capability, sourcePort, sourceChannel string, timeoutHeight clienttypes.Height, timeoutTimestamp uint64, data []byte) (uint64, error) { + var packetdata transfertypes.FungibleTokenPacketData + if err := json.Unmarshal(data, &packetdata); err != nil { + return i.channel.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) + } + if packetdata.Denom == "" || packetdata.Amount == "" { + return i.channel.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) + } + contract := i.GetContractAddress(ctx) + if contract == "" { + // The contract has not been configured. Continue as usual + return i.channel.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) + } + + // setting 0 as a default so it can be properly parsed by cosmwasm + fullPacket := channeltypes.Packet{ + Sequence: 0, + SourcePort: sourcePort, + SourceChannel: sourceChannel, + DestinationPort: "omitted", + DestinationChannel: "omitted", + Data: data, + TimeoutTimestamp: timeoutTimestamp, + TimeoutHeight: timeoutHeight, + } + + err := CheckAndUpdateRateLimits(ctx, i.ContractKeeper, msgSend, contract, fullPacket) + if err != nil { + return 0, errorsmod.Wrap(err, "rate limit SendPacket failed to authorize transfer") + } + + return i.channel.SendPacket(ctx, chanCap, sourcePort, sourceChannel, timeoutHeight, timeoutTimestamp, data) +} + +func (i *ICS4Wrapper) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet exported.PacketI, ack exported.Acknowledgement) error { + return i.channel.WriteAcknowledgement(ctx, chanCap, packet, ack) +} + +func (i *ICS4Wrapper) GetContractAddress(ctx sdk.Context) (contract string) { + return i.GetParams(ctx).ContractAddress +} + +func (i *ICS4Wrapper) GetParams(ctx sdk.Context) (params types.Params) { + params = i.IbcratelimitKeeper.GetParams(ctx) + return params +} + +func (i *ICS4Wrapper) SetParams(ctx sdk.Context, params types.Params) error { + return i.IbcratelimitKeeper.SetParams(ctx, params) +} diff --git a/x/ibc-rate-limit/keeper/grpc_query_params.go b/x/ibc-rate-limit/keeper/grpc_query_params.go new file mode 100644 index 000000000..99a9571cb --- /dev/null +++ b/x/ibc-rate-limit/keeper/grpc_query_params.go @@ -0,0 +1,20 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "invalid request") + } + ctx := sdk.UnwrapSDKContext(c) + + return &types.QueryParamsResponse{Params: k.GetParams(ctx)}, nil +} diff --git a/x/ibc-rate-limit/keeper/keeper.go b/x/ibc-rate-limit/keeper/keeper.go new file mode 100644 index 000000000..a726c3ef1 --- /dev/null +++ b/x/ibc-rate-limit/keeper/keeper.go @@ -0,0 +1,60 @@ +package keeper + +import ( + storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +// Keeper of the globalfee store +type Keeper struct { + cdc codec.BinaryCodec + storeKey storetypes.StoreKey + + // the address capable of executing a MsgUpdateParams message. Typically, this + // should be the x/adminmodule module account. + authority string +} + +func NewKeeper( + cdc codec.BinaryCodec, + key storetypes.StoreKey, + authority string, +) Keeper { + return Keeper{ + cdc: cdc, + storeKey: key, + authority: authority, + } +} + +// GetAuthority returns the x/ibcratelimit module's authority. +func (k Keeper) GetAuthority() string { + return k.authority +} + +// GetParams returns the total set params. +func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.ParamsKey) + if bz == nil { + return params + } + + k.cdc.MustUnmarshal(bz, ¶ms) + return params +} + +// SetParams sets the total set of params. +func (k Keeper) SetParams(ctx sdk.Context, params types.Params) error { + store := ctx.KVStore(k.storeKey) + bz, err := k.cdc.Marshal(¶ms) + if err != nil { + return err + } + + store.Set(types.ParamsKey, bz) + return nil +} diff --git a/x/ibc-rate-limit/keeper/msg_server.go b/x/ibc-rate-limit/keeper/msg_server.go new file mode 100644 index 000000000..1f7e864bc --- /dev/null +++ b/x/ibc-rate-limit/keeper/msg_server.go @@ -0,0 +1,41 @@ +package keeper + +import ( + "context" + + "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +type msgServer struct { + Keeper +} + +// NewMsgServerImpl returns an implementation of the MsgServer interface +// for the provided Keeper. +func NewMsgServerImpl(keeper Keeper) types.MsgServer { + return &msgServer{Keeper: keeper} +} + +var _ types.MsgServer = msgServer{} + +// UpdateParams updates the module parameters +func (k Keeper) UpdateParams(goCtx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { + if err := req.Validate(); err != nil { + return nil, errors.Wrap(err, "failed to validate MsgUpdateParams") + } + authority := k.GetAuthority() + if authority != req.Authority { + return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid authority; expected %s, got %s", authority, req.Authority) + } + + ctx := sdk.UnwrapSDKContext(goCtx) + if err := k.SetParams(ctx, req.Params); err != nil { + return nil, err + } + + return &types.MsgUpdateParamsResponse{}, nil +} diff --git a/x/ibc-rate-limit/module.go b/x/ibc-rate-limit/module.go new file mode 100644 index 000000000..aa794bf49 --- /dev/null +++ b/x/ibc-rate-limit/module.go @@ -0,0 +1,145 @@ +package ibcratelimit + +import ( + "context" + "encoding/json" + "fmt" + + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper" + "github.com/spf13/cobra" + + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/codec" + + "cosmossdk.io/core/appmodule" + + ibcratelimitcli "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/client/cli" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +var ( + _ module.AppModuleBasic = AppModuleBasic{} + _ module.HasGenesisBasics = AppModuleBasic{} + + _ appmodule.AppModule = AppModule{} + _ module.HasConsensusVersion = AppModule{} + _ module.HasGenesis = AppModule{} + _ module.HasServices = AppModule{} +) + +type AppModuleBasic struct { + cdc codec.BinaryCodec +} + +func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { + return AppModuleBasic{cdc: cdc} +} + +func (AppModuleBasic) Name() string { return types.ModuleName } + +func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { + types.RegisterCodec(cdc) +} + +func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { + return cdc.MustMarshalJSON(types.DefaultGenesis()) +} + +// ValidateGenesis performs genesis state validation for the ibcratelimit module. +func (b AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncodingConfig, bz json.RawMessage) error { + var genState types.GenesisState + if err := cdc.UnmarshalJSON(bz, &genState); err != nil { + return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err) + } + return genState.Validate() +} + +// --------------------------------------- +// Interfaces. +func (b AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { + types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) //nolint:errcheck +} + +func (b AppModuleBasic) GetTxCmd() *cobra.Command { + return nil +} + +func (b AppModuleBasic) GetQueryCmd() *cobra.Command { + return ibcratelimitcli.GetQueryCmd() +} + +// RegisterInterfaces registers interfaces and implementations of the ibc-rate-limit module. +func (AppModuleBasic) RegisterInterfaces(reg codectypes.InterfaceRegistry) { + types.RegisterInterfaces(reg) +} + +// ---------------------------------------------------------------------------- +// AppModule +// ---------------------------------------------------------------------------- + +// AppModule implements the AppModule interface for the capability module. +type AppModule struct { + AppModuleBasic + + ics4wrapper *ICS4Wrapper + keeper *keeper.Keeper +} + +func NewAppModule( + cdc codec.Codec, + keeper *keeper.Keeper, + ics4wrapper *ICS4Wrapper, +) AppModule { + return AppModule{ + AppModuleBasic: NewAppModuleBasic(cdc), + keeper: keeper, + ics4wrapper: ics4wrapper, + } +} + +// IsAppModule implements the appmodule.AppModule interface. +func (am AppModule) IsAppModule() {} + +// IsOnePerModuleType is a marker function just indicates that this is a one-per-module type. +func (am AppModule) IsOnePerModuleType() {} + +// Name returns the txfees module's name. +func (am AppModule) Name() string { + return am.AppModuleBasic.Name() +} + +// QuerierRoute returns the ibc-rate-limit module's query routing key. +func (AppModule) QuerierRoute() string { return types.RouterKey } + +// RegisterServices registers a GRPC query service to respond to the +// module-specific GRPC queries. +func (am AppModule) RegisterServices(cfg module.Configurator) { + types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(*am.keeper)) +} + +// RegisterInvariants registers the txfees module's invariants. +func (am AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} + +// InitGenesis performs the txfees module's genesis initialization It returns +// no validator updates. +func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.RawMessage) { + var genState types.GenesisState + // Initialize global index to index in genesis state + cdc.MustUnmarshalJSON(gs, &genState) + am.ics4wrapper.InitGenesis(ctx, genState) +} + +// ExportGenesis returns the txfees module's exported genesis state as raw JSON bytes. +func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { + genState := am.ics4wrapper.ExportGenesis(ctx) + return cdc.MustMarshalJSON(genState) +} + +// ConsensusVersion implements AppModule/ConsensusVersion. +func (AppModule) ConsensusVersion() uint64 { return 1 } diff --git a/x/ibc-rate-limit/module_simulation.go b/x/ibc-rate-limit/module_simulation.go new file mode 100644 index 000000000..0bc601524 --- /dev/null +++ b/x/ibc-rate-limit/module_simulation.go @@ -0,0 +1,48 @@ +package ibcratelimit + +import ( + "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/testutil/sims" + "github.com/cosmos/cosmos-sdk/types/module" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + "github.com/cosmos/cosmos-sdk/x/simulation" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + ibcratelimitsimulation "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/simulation" + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +// avoid unused import issue +var ( + _ = sample.AccAddress + _ = ibcratelimitsimulation.FindAccount + _ = sims.StakePerAccount + _ = simulation.MsgEntryKind + _ = baseapp.Paramspace +) + +// GenerateGenesisState creates a randomized GenState of the module +func (AppModule) GenerateGenesisState(simState *module.SimulationState) { + accs := make([]string, len(simState.Accounts)) + for i, acc := range simState.Accounts { + accs[i] = acc.Address.String() + } + interchainqueriesGenesis := types.GenesisState{ + Params: types.DefaultParams(), + } + simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&interchainqueriesGenesis) +} + +// ProposalContents doesn't return any content functions for governance proposals +func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg { + return nil +} + +// RegisterStoreDecoder registers a decoder +func (am AppModule) RegisterStoreDecoder(_ simtypes.StoreDecoderRegistry) {} + +// WeightedOperations returns the all the gov module operations with their respective weights. +func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { + operations := make([]simtypes.WeightedOperation, 0) + + return operations +} diff --git a/x/ibc-rate-limit/rate_limit.go b/x/ibc-rate-limit/rate_limit.go new file mode 100644 index 000000000..eb8d01f49 --- /dev/null +++ b/x/ibc-rate-limit/rate_limit.go @@ -0,0 +1,153 @@ +package ibcratelimit + +import ( + "encoding/json" + + errorsmod "cosmossdk.io/errors" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + sdk "github.com/cosmos/cosmos-sdk/types" + transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + "github.com/cosmos/ibc-go/v8/modules/core/exported" + + "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types" +) + +var ( + msgSend = "send_packet" + msgRecv = "recv_packet" +) + +func CheckAndUpdateRateLimits(ctx sdk.Context, contractKeeper *wasmkeeper.PermissionedKeeper, + msgType, contract string, packet exported.PacketI, +) error { + contractAddr, err := sdk.AccAddressFromBech32(contract) + if err != nil { + return err + } + + sendPacketMsg, err := BuildWasmExecMsg( + msgType, + packet, + ) + if err != nil { + return errorsmod.Wrap(err, "failed to CheckAndUpdateRateLimits") + } + + _, err = contractKeeper.Sudo(ctx, contractAddr, sendPacketMsg) + if err != nil { + return errorsmod.Wrap(types.ErrRateLimitExceeded, err.Error()) + } + + return nil +} + +type UndoSendMsg struct { + UndoSend UndoPacketMsg `json:"undo_send"` +} + +type UndoPacketMsg struct { + Packet UnwrappedPacket `json:"packet"` +} + +func UndoSendRateLimit(ctx sdk.Context, contractKeeper *wasmkeeper.PermissionedKeeper, + contract string, + packet exported.PacketI, +) error { + contractAddr, err := sdk.AccAddressFromBech32(contract) + if err != nil { + return errorsmod.Wrap(err, "failed to UndoSendRateLimit") + } + + unwrapped, err := unwrapPacket(packet) + if err != nil { + return errorsmod.Wrap(err, "failed to UndoSendRateLimit") + } + + msg := UndoSendMsg{UndoSend: UndoPacketMsg{Packet: unwrapped}} + asJSON, err := json.Marshal(msg) + if err != nil { + return errorsmod.Wrap(err, "failed to UndoSendRateLimit") + } + + _, err = contractKeeper.Sudo(ctx, contractAddr, asJSON) + if err != nil { + return errorsmod.Wrap(types.ErrContractError, err.Error()) + } + + return nil +} + +type SendPacketMsg struct { + SendPacket PacketMsg `json:"send_packet"` +} + +type RecvPacketMsg struct { + RecvPacket PacketMsg `json:"recv_packet"` +} + +type PacketMsg struct { + Packet UnwrappedPacket `json:"packet"` +} + +type UnwrappedPacket struct { + Sequence uint64 `json:"sequence"` + SourcePort string `json:"source_port"` + SourceChannel string `json:"source_channel"` + DestinationPort string `json:"destination_port"` + DestinationChannel string `json:"destination_channel"` + Data transfertypes.FungibleTokenPacketData `json:"data"` + TimeoutHeight clienttypes.Height `json:"timeout_height"` + TimeoutTimestamp uint64 `json:"timeout_timestamp,omitempty"` +} + +func unwrapPacket(packet exported.PacketI) (UnwrappedPacket, error) { + var packetData transfertypes.FungibleTokenPacketData + err := json.Unmarshal(packet.GetData(), &packetData) + if err != nil { + return UnwrappedPacket{}, err + } + height, ok := packet.GetTimeoutHeight().(clienttypes.Height) + if !ok { + return UnwrappedPacket{}, types.ErrBadMessage + } + return UnwrappedPacket{ + Sequence: packet.GetSequence(), + SourcePort: packet.GetSourcePort(), + SourceChannel: packet.GetSourceChannel(), + DestinationPort: packet.GetDestPort(), + DestinationChannel: packet.GetDestChannel(), + Data: packetData, + TimeoutHeight: height, + TimeoutTimestamp: packet.GetTimeoutTimestamp(), + }, nil +} + +func BuildWasmExecMsg(msgType string, packet exported.PacketI) ([]byte, error) { + unwrapped, err := unwrapPacket(packet) + if err != nil { + return []byte{}, err + } + + var asJSON []byte + switch { + case msgType == msgSend: + msg := SendPacketMsg{SendPacket: PacketMsg{ + Packet: unwrapped, + }} + asJSON, err = json.Marshal(msg) + case msgType == msgRecv: + msg := RecvPacketMsg{RecvPacket: PacketMsg{ + Packet: unwrapped, + }} + asJSON, err = json.Marshal(msg) + default: + return []byte{}, types.ErrBadMessage + } + + if err != nil { + return []byte{}, errorsmod.Wrap(err, "failed to BuildWasmExecMsg") + } + + return asJSON, nil +} diff --git a/x/ibc-rate-limit/simulation/simap.go b/x/ibc-rate-limit/simulation/simap.go new file mode 100644 index 000000000..92c437c0d --- /dev/null +++ b/x/ibc-rate-limit/simulation/simap.go @@ -0,0 +1,15 @@ +package simulation + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" +) + +// FindAccount find a specific address from an account list +func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { + creator, err := sdk.AccAddressFromBech32(address) + if err != nil { + panic(err) + } + return simtypes.FindAccount(accs, creator) +} diff --git a/x/ibc-rate-limit/types/codec.go b/x/ibc-rate-limit/types/codec.go new file mode 100644 index 000000000..e1725d89d --- /dev/null +++ b/x/ibc-rate-limit/types/codec.go @@ -0,0 +1,25 @@ +package types + +import ( + "github.com/cosmos/cosmos-sdk/codec" + cdctypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/msgservice" +) + +func RegisterCodec(cdc *codec.LegacyAmino) { + cdc.RegisterConcrete(&MsgUpdateParams{}, "neutron/ibc-rate-limit/update-params", nil) +} + +func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { + registry.RegisterImplementations( + (*sdk.Msg)(nil), + &MsgUpdateParams{}, + ) + msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) +} + +var ( + Amino = codec.NewLegacyAmino() + ModuleCdc *codec.ProtoCodec +) diff --git a/x/ibc-rate-limit/types/constants.go b/x/ibc-rate-limit/types/constants.go new file mode 100644 index 000000000..4d4fce0bd --- /dev/null +++ b/x/ibc-rate-limit/types/constants.go @@ -0,0 +1,6 @@ +package types + +const ( + MaxSupportedIBCReceiverAddressLength = 4096 + RateLimitExceededSubStr = "rate limit exceeded" +) diff --git a/x/ibc-rate-limit/types/errors.go b/x/ibc-rate-limit/types/errors.go new file mode 100644 index 000000000..42116a7e1 --- /dev/null +++ b/x/ibc-rate-limit/types/errors.go @@ -0,0 +1,11 @@ +package types + +import ( + errorsmod "cosmossdk.io/errors" +) + +var ( + ErrRateLimitExceeded = errorsmod.Register(ModuleName, 2, "rate limit exceeded") + ErrBadMessage = errorsmod.Register(ModuleName, 3, "bad message") + ErrContractError = errorsmod.Register(ModuleName, 4, "contract error") +) diff --git a/x/ibc-rate-limit/types/events.go b/x/ibc-rate-limit/types/events.go new file mode 100644 index 000000000..36d31181e --- /dev/null +++ b/x/ibc-rate-limit/types/events.go @@ -0,0 +1,8 @@ +package types + +const ( + EventBadRevert = "bad_revert" + AttributeKeyPacket = "packet" + AttributeKeyAck = "acknowledgement" + AttributeKeyFailureType = "failure_type" +) diff --git a/x/ibc-rate-limit/types/genesis.go b/x/ibc-rate-limit/types/genesis.go new file mode 100644 index 000000000..9167936c6 --- /dev/null +++ b/x/ibc-rate-limit/types/genesis.go @@ -0,0 +1,17 @@ +package types + +// DefaultGenesis creates a default GenesisState object. +func DefaultGenesis() *GenesisState { + return &GenesisState{ + Params: DefaultParams(), + } +} + +// Validate performs basic genesis state validation returning an error upon any +// failure. +func (gs GenesisState) Validate() error { + if err := gs.Params.Validate(); err != nil { + return err + } + return nil +} diff --git a/x/ibc-rate-limit/types/genesis.pb.go b/x/ibc-rate-limit/types/genesis.pb.go new file mode 100644 index 000000000..735122fb7 --- /dev/null +++ b/x/ibc-rate-limit/types/genesis.pb.go @@ -0,0 +1,329 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/ibcratelimit/v1beta1/genesis.proto + +package types + +import ( + fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/codec/types" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// GenesisState defines the ibc-rate-limit module's genesis state. +type GenesisState struct { + // params are all the parameters of the module + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` +} + +func (m *GenesisState) Reset() { *m = GenesisState{} } +func (m *GenesisState) String() string { return proto.CompactTextString(m) } +func (*GenesisState) ProtoMessage() {} +func (*GenesisState) Descriptor() ([]byte, []int) { + return fileDescriptor_4a6a285b43c9c3fe, []int{0} +} +func (m *GenesisState) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *GenesisState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_GenesisState.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *GenesisState) XXX_Merge(src proto.Message) { + xxx_messageInfo_GenesisState.Merge(m, src) +} +func (m *GenesisState) XXX_Size() int { + return m.Size() +} +func (m *GenesisState) XXX_DiscardUnknown() { + xxx_messageInfo_GenesisState.DiscardUnknown(m) +} + +var xxx_messageInfo_GenesisState proto.InternalMessageInfo + +func (m *GenesisState) GetParams() Params { + if m != nil { + return m.Params + } + return Params{} +} + +func init() { + proto.RegisterType((*GenesisState)(nil), "neutron.ibcratelimit.v1beta1.GenesisState") +} + +func init() { + proto.RegisterFile("neutron/ibcratelimit/v1beta1/genesis.proto", fileDescriptor_4a6a285b43c9c3fe) +} + +var fileDescriptor_4a6a285b43c9c3fe = []byte{ + // 250 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0x4c, 0x4a, 0x2e, 0x4a, 0x2c, 0x49, 0xcd, 0xc9, 0xcc, 0xcd, 0x2c, + 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, + 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0xaa, 0xd5, 0x43, 0x56, 0xab, 0x07, 0x55, + 0x2b, 0x25, 0x99, 0x9c, 0x5f, 0x9c, 0x9b, 0x5f, 0x1c, 0x0f, 0x56, 0xab, 0x0f, 0xe1, 0x40, 0x34, + 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x43, 0xc4, 0x41, 0x2c, 0xa8, 0xa8, 0x64, 0x7a, 0x7e, 0x7e, + 0x7a, 0x4e, 0xaa, 0x3e, 0x98, 0x97, 0x54, 0x9a, 0xa6, 0x9f, 0x98, 0x57, 0x09, 0x95, 0xd2, 0xc4, + 0xeb, 0xaa, 0x82, 0xc4, 0xa2, 0xc4, 0x5c, 0xa8, 0xd9, 0x4a, 0x41, 0x5c, 0x3c, 0xee, 0x10, 0x57, + 0x06, 0x97, 0x24, 0x96, 0xa4, 0x0a, 0x39, 0x71, 0xb1, 0x41, 0xe4, 0x25, 0x18, 0x15, 0x18, 0x35, + 0xb8, 0x8d, 0x54, 0xf4, 0xf0, 0xb9, 0x5a, 0x2f, 0x00, 0xac, 0xd6, 0x89, 0xe5, 0xc4, 0x3d, 0x79, + 0x86, 0x20, 0xa8, 0x4e, 0xa7, 0xa0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, + 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, + 0xb2, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x9a, 0xab, 0x9b, + 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x80, 0x1c, 0xad, 0x0b, 0xb2, 0x49, 0x17, + 0xe2, 0xec, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x73, 0x8d, 0x01, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xc8, 0xd2, 0x7b, 0x68, 0x71, 0x01, 0x00, 0x00, +} + +func (m *GenesisState) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *GenesisState) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { + offset -= sovGenesis(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *GenesisState) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Params.Size() + n += 1 + l + sovGenesis(uint64(l)) + return n +} + +func sovGenesis(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozGenesis(x uint64) (n int) { + return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *GenesisState) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: GenesisState: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: GenesisState: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenesis(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenesis + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipGenesis(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowGenesis + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowGenesis + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowGenesis + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthGenesis + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGenesis + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthGenesis + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthGenesis = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGenesis = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGenesis = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/ibc-rate-limit/types/keys.go b/x/ibc-rate-limit/types/keys.go new file mode 100644 index 000000000..1ce3db024 --- /dev/null +++ b/x/ibc-rate-limit/types/keys.go @@ -0,0 +1,18 @@ +package types + +import "strings" + +const ( + prefixParamsKey = iota + 1 +) + +const ( + ModuleName = "rate-limited-ibc" // IBC at the end to avoid conflicts with the ibc prefix + +) + +var ParamsKey = []byte{prefixParamsKey} + +// RouterKey is the message route. Can only contain +// alphanumeric characters. +var RouterKey = strings.ReplaceAll(ModuleName, "-", "") diff --git a/x/ibc-rate-limit/types/params.go b/x/ibc-rate-limit/types/params.go new file mode 100644 index 000000000..35b172863 --- /dev/null +++ b/x/ibc-rate-limit/types/params.go @@ -0,0 +1,73 @@ +package types + +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" +) + +// Parameter store keys. +var ( + KeyContractAddress = []byte("contract") + + _ paramtypes.ParamSet = &Params{} +) + +func ParamKeyTable() paramtypes.KeyTable { + return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) +} + +func NewParams(contractAddress string) (Params, error) { + return Params{ + ContractAddress: contractAddress, + }, nil +} + +// default gamm module parameters. +func DefaultParams() Params { + return Params{ + ContractAddress: "", + } +} + +// validate params. +func (p Params) Validate() error { + if err := validateContractAddress(p.ContractAddress); err != nil { + return err + } + + return nil +} + +// Implements params.ParamSet. +func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { + return paramtypes.ParamSetPairs{ + paramtypes.NewParamSetPair(KeyContractAddress, &p.ContractAddress, validateContractAddress), + } +} + +func validateContractAddress(i interface{}) error { + v, ok := i.(string) + if !ok { + return fmt.Errorf("invalid parameter type: %T", i) + } + + // Empty strings are valid for unsetting the param + if v == "" { + return nil + } + + // Checks that the contract address is valid + bech32, err := sdk.AccAddressFromBech32(v) + if err != nil { + return err + } + + err = sdk.VerifyAddressFormat(bech32) + if err != nil { + return err + } + + return nil +} diff --git a/x/ibc-rate-limit/types/params.pb.go b/x/ibc-rate-limit/types/params.pb.go new file mode 100644 index 000000000..81ce2f24f --- /dev/null +++ b/x/ibc-rate-limit/types/params.pb.go @@ -0,0 +1,322 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/ibcratelimit/v1beta1/params.proto + +package types + +import ( + fmt "fmt" + _ "github.com/cosmos/gogoproto/gogoproto" + proto "github.com/cosmos/gogoproto/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// Params defines the parameters for the ibc-rate-limit module. +type Params struct { + ContractAddress string `protobuf:"bytes,1,opt,name=contract_address,json=contractAddress,proto3" json:"contract_address,omitempty" yaml:"contract_address"` +} + +func (m *Params) Reset() { *m = Params{} } +func (m *Params) String() string { return proto.CompactTextString(m) } +func (*Params) ProtoMessage() {} +func (*Params) Descriptor() ([]byte, []int) { + return fileDescriptor_96b2a3ecd8a27c06, []int{0} +} +func (m *Params) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Params.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Params) XXX_Merge(src proto.Message) { + xxx_messageInfo_Params.Merge(m, src) +} +func (m *Params) XXX_Size() int { + return m.Size() +} +func (m *Params) XXX_DiscardUnknown() { + xxx_messageInfo_Params.DiscardUnknown(m) +} + +var xxx_messageInfo_Params proto.InternalMessageInfo + +func (m *Params) GetContractAddress() string { + if m != nil { + return m.ContractAddress + } + return "" +} + +func init() { + proto.RegisterType((*Params)(nil), "neutron.ibcratelimit.v1beta1.Params") +} + +func init() { + proto.RegisterFile("neutron/ibcratelimit/v1beta1/params.proto", fileDescriptor_96b2a3ecd8a27c06) +} + +var fileDescriptor_96b2a3ecd8a27c06 = []byte{ + // 222 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcc, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0x4c, 0x4a, 0x2e, 0x4a, 0x2c, 0x49, 0xcd, 0xc9, 0xcc, 0xcd, 0x2c, + 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, + 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x81, 0x2a, 0xd5, 0x43, 0x56, 0xaa, 0x07, 0x55, 0x2a, + 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa8, 0x0f, 0x62, 0x41, 0xf4, 0x28, 0x85, 0x70, 0xb1, + 0x05, 0x80, 0xcd, 0x10, 0xf2, 0xe2, 0x12, 0x48, 0xce, 0xcf, 0x2b, 0x29, 0x4a, 0x4c, 0x2e, 0x89, + 0x4f, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x92, 0x3f, + 0x71, 0x4f, 0x9e, 0xf1, 0xd3, 0x3d, 0x79, 0xf1, 0xca, 0xc4, 0xdc, 0x1c, 0x2b, 0x25, 0x74, 0x55, + 0x4a, 0x41, 0xfc, 0x30, 0x21, 0x47, 0x88, 0x88, 0x53, 0xd0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, + 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, + 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, + 0x43, 0x9d, 0xab, 0x9b, 0x5f, 0x94, 0x0e, 0x63, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x80, 0xbc, 0xaa, + 0x0b, 0xf2, 0x80, 0x2e, 0xc4, 0xb3, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x07, 0x1b, + 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x65, 0xd8, 0x69, 0x11, 0x01, 0x00, 0x00, +} + +func (m *Params) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Params) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ContractAddress) > 0 { + i -= len(m.ContractAddress) + copy(dAtA[i:], m.ContractAddress) + i = encodeVarintParams(dAtA, i, uint64(len(m.ContractAddress))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintParams(dAtA []byte, offset int, v uint64) int { + offset -= sovParams(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Params) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ContractAddress) + if l > 0 { + n += 1 + l + sovParams(uint64(l)) + } + return n +} + +func sovParams(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozParams(x uint64) (n int) { + return sovParams(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Params) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Params: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ContractAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowParams + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthParams + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthParams + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ContractAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipParams(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthParams + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipParams(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowParams + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowParams + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowParams + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthParams + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupParams + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthParams + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthParams = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowParams = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupParams = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/ibc-rate-limit/types/params_test.go b/x/ibc-rate-limit/types/params_test.go new file mode 100644 index 000000000..f37e4d886 --- /dev/null +++ b/x/ibc-rate-limit/types/params_test.go @@ -0,0 +1,79 @@ +package types + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestValidateContractAddress(t *testing.T) { + testCases := map[string]struct { + addr interface{} + expected bool + }{ + // ToDo: Why do tests expect the bech32 prefix to be cosmos? + "valid_addr": { + addr: "cosmos1qm0hhug8kszhcp9f3ryuecz5yw8s3e5v0n2ckd", + expected: true, + }, + "invalid_addr": { + addr: "cosmos1234", + expected: false, + }, + "invalid parameter type": { + addr: 123456, + expected: false, + }, + } + + for name, tc := range testCases { + t.Run(name, func(t *testing.T) { + err := validateContractAddress(tc.addr) + + // Assertions. + if !tc.expected { + require.Error(t, err) + return + } + + require.NoError(t, err) + }) + } +} + +func TestValidateParams(t *testing.T) { + testCases := map[string]struct { + addr interface{} + expected bool + }{ + // ToDo: Why do tests expect the bech32 prefix to be cosmos? + "valid_addr": { + addr: "cosmos1qm0hhug8kszhcp9f3ryuecz5yw8s3e5v0n2ckd", + expected: true, + }, + "invalid_addr": { + addr: "cosmos1234", + expected: false, + }, + } + + for name, tc := range testCases { + t.Run(name, func(t *testing.T) { + addr, ok := tc.addr.(string) + require.True(t, ok, "unexpected type of address") + + params := Params{ + ContractAddress: addr, + } + + err := params.Validate() + + // Assertions. + if !tc.expected { + require.Error(t, err) + } else { + require.NoError(t, err) + } + }) + } +} diff --git a/x/ibc-rate-limit/types/query.pb.go b/x/ibc-rate-limit/types/query.pb.go new file mode 100644 index 000000000..f794ecbd4 --- /dev/null +++ b/x/ibc-rate-limit/types/query.pb.go @@ -0,0 +1,542 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/ibcratelimit/v1beta1/query.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-sdk/types/query" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + _ "google.golang.org/genproto/googleapis/api/annotations" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// ParamsRequest is the request type for the Query/Params RPC method. +type QueryParamsRequest struct { +} + +func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } +func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryParamsRequest) ProtoMessage() {} +func (*QueryParamsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_a6095f726b1d3aec, []int{0} +} +func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsRequest.Merge(m, src) +} +func (m *QueryParamsRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryParamsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo + +// aramsResponse is the response type for the Query/Params RPC method. +type QueryParamsResponse struct { + // params defines the parameters of the module. + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` +} + +func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } +func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryParamsResponse) ProtoMessage() {} +func (*QueryParamsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_a6095f726b1d3aec, []int{1} +} +func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsResponse.Merge(m, src) +} +func (m *QueryParamsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryParamsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo + +func (m *QueryParamsResponse) GetParams() Params { + if m != nil { + return m.Params + } + return Params{} +} + +func init() { + proto.RegisterType((*QueryParamsRequest)(nil), "neutron.ibcratelimit.v1beta1.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "neutron.ibcratelimit.v1beta1.QueryParamsResponse") +} + +func init() { + proto.RegisterFile("neutron/ibcratelimit/v1beta1/query.proto", fileDescriptor_a6095f726b1d3aec) +} + +var fileDescriptor_a6095f726b1d3aec = []byte{ + // 318 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xcd, 0x4a, 0x33, 0x31, + 0x14, 0x86, 0x27, 0x1f, 0x9f, 0x5d, 0x8c, 0xbb, 0xd8, 0x85, 0x94, 0x12, 0xa5, 0x88, 0x54, 0xa1, + 0x89, 0xad, 0x08, 0xae, 0x7b, 0x05, 0xda, 0x9d, 0xee, 0x32, 0x25, 0xc4, 0x40, 0x27, 0x27, 0x4d, + 0x32, 0xc5, 0x6e, 0xbd, 0x02, 0xc1, 0xb5, 0x6b, 0x6f, 0xa5, 0xcb, 0x82, 0x1b, 0x57, 0x22, 0xad, + 0x17, 0x22, 0x9d, 0xc4, 0x52, 0x7f, 0x18, 0x70, 0x77, 0x38, 0x79, 0x9f, 0x87, 0x37, 0x27, 0x6d, + 0x6b, 0x51, 0x78, 0x0b, 0x9a, 0xa9, 0x6c, 0x68, 0xb9, 0x17, 0x23, 0x95, 0x2b, 0xcf, 0x26, 0xdd, + 0x4c, 0x78, 0xde, 0x65, 0xe3, 0x42, 0xd8, 0x29, 0x35, 0x16, 0x3c, 0xe0, 0x66, 0x4c, 0xd2, 0xcd, + 0x24, 0x8d, 0xc9, 0xc6, 0xf1, 0x10, 0x5c, 0x0e, 0x8e, 0x65, 0xdc, 0x89, 0x80, 0xad, 0x25, 0x86, + 0x4b, 0xa5, 0xb9, 0x57, 0xa0, 0x83, 0xa9, 0x51, 0x97, 0x20, 0xa1, 0x1c, 0xd9, 0x6a, 0x8a, 0xdb, + 0xa6, 0x04, 0x90, 0x23, 0xc1, 0xb8, 0x51, 0x8c, 0x6b, 0x0d, 0xbe, 0x44, 0x5c, 0x7c, 0x3d, 0xaa, + 0xec, 0x69, 0xb8, 0xe5, 0x79, 0x8c, 0xb6, 0xea, 0x29, 0xbe, 0x5c, 0x15, 0xb8, 0x28, 0x97, 0x03, + 0x31, 0x2e, 0x84, 0xf3, 0xad, 0xab, 0x74, 0xe7, 0xcb, 0xd6, 0x19, 0xd0, 0x4e, 0xe0, 0x7e, 0x5a, + 0x0b, 0xf0, 0x2e, 0xda, 0x47, 0xed, 0xed, 0xde, 0x01, 0xad, 0xfa, 0x26, 0x0d, 0x74, 0xff, 0xff, + 0xec, 0x75, 0x2f, 0x19, 0x44, 0xb2, 0xf7, 0x84, 0xd2, 0xad, 0xd2, 0x8d, 0x1f, 0x51, 0x5a, 0x0b, + 0x11, 0x7c, 0x52, 0x2d, 0xfa, 0xd9, 0xb0, 0xd1, 0xfd, 0x03, 0x11, 0xda, 0xb7, 0xe8, 0xdd, 0xf3, + 0xfb, 0xc3, 0xbf, 0x36, 0x3e, 0x64, 0x1b, 0xe7, 0xe9, 0xac, 0xd8, 0xce, 0x6f, 0x07, 0xea, 0x0f, + 0x66, 0x0b, 0x82, 0xe6, 0x0b, 0x82, 0xde, 0x16, 0x04, 0xdd, 0x2f, 0x49, 0x32, 0x5f, 0x92, 0xe4, + 0x65, 0x49, 0x92, 0xeb, 0x73, 0xa9, 0xfc, 0x4d, 0x91, 0xd1, 0x21, 0xe4, 0x9f, 0xae, 0x0e, 0x58, + 0xb9, 0xf6, 0x4e, 0xce, 0xd8, 0xed, 0x77, 0xb9, 0x9f, 0x1a, 0xe1, 0xb2, 0x5a, 0x79, 0xf5, 0xd3, + 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xee, 0xd8, 0x97, 0x25, 0x4a, 0x02, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// QueryClient is the client API for Query service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type QueryClient interface { + // Params defines a gRPC query method that returns the ibc-rate-limit module's + // parameters. + Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) +} + +type queryClient struct { + cc grpc1.ClientConn +} + +func NewQueryClient(cc grpc1.ClientConn) QueryClient { + return &queryClient{cc} +} + +func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { + out := new(QueryParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.ibcratelimit.v1beta1.Query/Params", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// QueryServer is the server API for Query service. +type QueryServer interface { + // Params defines a gRPC query method that returns the ibc-rate-limit module's + // parameters. + Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) +} + +// UnimplementedQueryServer can be embedded to have forward compatible implementations. +type UnimplementedQueryServer struct { +} + +func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") +} + +func RegisterQueryServer(s grpc1.Server, srv QueryServer) { + s.RegisterService(&_Query_serviceDesc, srv) +} + +func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryParamsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).Params(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.ibcratelimit.v1beta1.Query/Params", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +var _Query_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neutron.ibcratelimit.v1beta1.Query", + HandlerType: (*QueryServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "Params", + Handler: _Query_Params_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/ibcratelimit/v1beta1/query.proto", +} + +func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { + offset -= sovQuery(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *QueryParamsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *QueryParamsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.Params.Size() + n += 1 + l + sovQuery(uint64(l)) + return n +} + +func sovQuery(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozQuery(x uint64) (n int) { + return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipQuery(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQuery + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQuery + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowQuery + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthQuery + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupQuery + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthQuery + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthQuery = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowQuery = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupQuery = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/ibc-rate-limit/types/query.pb.gw.go b/x/ibc-rate-limit/types/query.pb.gw.go new file mode 100644 index 000000000..1e18d9032 --- /dev/null +++ b/x/ibc-rate-limit/types/query.pb.gw.go @@ -0,0 +1,153 @@ +// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. +// source: neutron/ibcratelimit/v1beta1/query.proto + +/* +Package types is a reverse proxy. + +It translates gRPC into RESTful JSON APIs. +*/ +package types + +import ( + "context" + "io" + "net/http" + + "github.com/golang/protobuf/descriptor" + "github.com/golang/protobuf/proto" + "github.com/grpc-ecosystem/grpc-gateway/runtime" + "github.com/grpc-ecosystem/grpc-gateway/utilities" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/grpclog" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" +) + +// Suppress "imported and not used" errors +var _ codes.Code +var _ io.Reader +var _ status.Status +var _ = runtime.String +var _ = utilities.NewDoubleArray +var _ = descriptor.ForMessage +var _ = metadata.Join + +func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryParamsRequest + var metadata runtime.ServerMetadata + + msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryParamsRequest + var metadata runtime.ServerMetadata + + msg, err := server.Params(ctx, &protoReq) + return msg, metadata, err + +} + +// RegisterQueryHandlerServer registers the http handlers for service Query to "mux". +// UnaryRPC :call QueryServer directly. +// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. +// Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. +func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { + + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +// RegisterQueryHandlerFromEndpoint is same as RegisterQueryHandler but +// automatically dials to "endpoint" and closes the connection when "ctx" gets done. +func RegisterQueryHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { + conn, err := grpc.Dial(endpoint, opts...) + if err != nil { + return err + } + defer func() { + if err != nil { + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + return + } + go func() { + <-ctx.Done() + if cerr := conn.Close(); cerr != nil { + grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + } + }() + }() + + return RegisterQueryHandler(ctx, mux, conn) +} + +// RegisterQueryHandler registers the http handlers for service Query to "mux". +// The handlers forward requests to the grpc endpoint over "conn". +func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.ClientConn) error { + return RegisterQueryHandlerClient(ctx, mux, NewQueryClient(conn)) +} + +// RegisterQueryHandlerClient registers the http handlers for service Query +// to "mux". The handlers forward requests to the grpc endpoint over the given implementation of "QueryClient". +// Note: the gRPC framework executes interceptors within the gRPC handler. If the passed in "QueryClient" +// doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in +// "QueryClient" to call the correct interceptors. +func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { + + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_Params_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + return nil +} + +var ( + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"neutron", "ibc-rate-limit", "v1beta1", "params"}, "", runtime.AssumeColonVerbOpt(false))) +) + +var ( + forward_Query_Params_0 = runtime.ForwardResponseMessage +) diff --git a/x/ibc-rate-limit/types/tx.go b/x/ibc-rate-limit/types/tx.go new file mode 100644 index 000000000..ec4026dc7 --- /dev/null +++ b/x/ibc-rate-limit/types/tx.go @@ -0,0 +1,44 @@ +package types + +import ( + errorsmod "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var _ sdk.Msg = &MsgUpdateParams{} + +func (msg *MsgUpdateParams) Route() string { + return RouterKey +} + +func (msg *MsgUpdateParams) Type() string { + return "update-params" +} + +func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { + authority, err := sdk.AccAddressFromBech32(msg.Authority) + if err != nil { // should never happen as valid basic rejects invalid addresses + panic(err.Error()) + } + return []sdk.AccAddress{authority} +} + +func (msg *MsgUpdateParams) GetSignBytes() []byte { + return ModuleCdc.MustMarshalJSON(msg) +} + +func (msg *MsgUpdateParams) Validate() error { + if _, err := sdk.AccAddressFromBech32(msg.Authority); err != nil { + return errorsmod.Wrap(err, "authority is invalid") + } + + // we allow unsetting the contract + if msg.Params.ContractAddress == "" { + return nil + } + if _, err := sdk.AccAddressFromBech32(msg.Params.ContractAddress); err != nil { + return errorsmod.Wrap(err, "contract_address is invalid") + } + + return nil +} diff --git a/x/ibc-rate-limit/types/tx.pb.go b/x/ibc-rate-limit/types/tx.pb.go new file mode 100644 index 000000000..ddf4576ad --- /dev/null +++ b/x/ibc-rate-limit/types/tx.pb.go @@ -0,0 +1,605 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: neutron/ibcratelimit/v1beta1/tx.proto + +package types + +import ( + context "context" + fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "github.com/cosmos/cosmos-sdk/x/bank/types" + _ "github.com/cosmos/gogoproto/gogoproto" + grpc1 "github.com/cosmos/gogoproto/grpc" + proto "github.com/cosmos/gogoproto/proto" + grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// MsgUpdateParams is the MsgUpdateParams request type. +// +// Since: 0.47 +type MsgUpdateParams struct { + // Authority is the address of the governance account. + Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` + // params defines the x/tokenfactory parameters to update. + // + // NOTE: All parameters must be supplied. + Params Params `protobuf:"bytes,2,opt,name=params,proto3" json:"params"` +} + +func (m *MsgUpdateParams) Reset() { *m = MsgUpdateParams{} } +func (m *MsgUpdateParams) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateParams) ProtoMessage() {} +func (*MsgUpdateParams) Descriptor() ([]byte, []int) { + return fileDescriptor_88b553b0b85135fe, []int{0} +} +func (m *MsgUpdateParams) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateParams) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateParams.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgUpdateParams) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParams.Merge(m, src) +} +func (m *MsgUpdateParams) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateParams) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParams.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateParams proto.InternalMessageInfo + +func (m *MsgUpdateParams) GetAuthority() string { + if m != nil { + return m.Authority + } + return "" +} + +func (m *MsgUpdateParams) GetParams() Params { + if m != nil { + return m.Params + } + return Params{} +} + +// MsgUpdateParamsResponse defines the response structure for executing a +// MsgUpdateParams message. +// +// Since: 0.47 +type MsgUpdateParamsResponse struct { +} + +func (m *MsgUpdateParamsResponse) Reset() { *m = MsgUpdateParamsResponse{} } +func (m *MsgUpdateParamsResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateParamsResponse) ProtoMessage() {} +func (*MsgUpdateParamsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_88b553b0b85135fe, []int{1} +} +func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) +} +func (m *MsgUpdateParamsResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo + +func init() { + proto.RegisterType((*MsgUpdateParams)(nil), "neutron.ibcratelimit.v1beta1.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "neutron.ibcratelimit.v1beta1.MsgUpdateParamsResponse") +} + +func init() { + proto.RegisterFile("neutron/ibcratelimit/v1beta1/tx.proto", fileDescriptor_88b553b0b85135fe) +} + +var fileDescriptor_88b553b0b85135fe = []byte{ + // 390 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcd, 0x4b, 0x2d, 0x2d, + 0x29, 0xca, 0xcf, 0xd3, 0xcf, 0x4c, 0x4a, 0x2e, 0x4a, 0x2c, 0x49, 0xcd, 0xc9, 0xcc, 0xcd, 0x2c, + 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0x92, 0x81, 0x2a, 0xd3, 0x43, 0x56, 0xa6, 0x07, 0x55, 0x26, 0x25, 0x98, 0x98, 0x9b, + 0x99, 0x97, 0xaf, 0x0f, 0x26, 0x21, 0x1a, 0xa4, 0xe4, 0x92, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xf5, + 0x93, 0x12, 0xf3, 0xb2, 0xe1, 0xc6, 0x81, 0x38, 0x18, 0xf2, 0xc5, 0xa9, 0x70, 0xf9, 0xe4, 0xfc, + 0xcc, 0x3c, 0xa8, 0xbc, 0x38, 0x54, 0x3e, 0xb7, 0x38, 0x5d, 0xbf, 0xcc, 0x10, 0x44, 0x41, 0x25, + 0x24, 0x21, 0x12, 0xf1, 0x60, 0x9e, 0x3e, 0x84, 0x03, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x87, + 0x88, 0x83, 0x58, 0x50, 0x51, 0x4d, 0xbc, 0x3e, 0x2c, 0x48, 0x2c, 0x4a, 0xcc, 0x85, 0x1a, 0xa0, + 0x74, 0x96, 0x91, 0x8b, 0xdf, 0xb7, 0x38, 0x3d, 0xb4, 0x20, 0x25, 0xb1, 0x24, 0x35, 0x00, 0x2c, + 0x23, 0x64, 0xc6, 0xc5, 0x99, 0x58, 0x5a, 0x92, 0x91, 0x5f, 0x94, 0x59, 0x52, 0x29, 0xc1, 0xa8, + 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0x71, 0x69, 0x8b, 0xae, 0x08, 0xd4, 0x66, 0xc7, 0x94, 0x94, 0xa2, + 0xd4, 0xe2, 0xe2, 0xe0, 0x92, 0xa2, 0xcc, 0xbc, 0xf4, 0x20, 0x84, 0x52, 0x21, 0x77, 0x2e, 0x36, + 0x88, 0xd9, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x2a, 0x7a, 0xf8, 0x82, 0x50, 0x0f, 0x62, + 0x9b, 0x13, 0xe7, 0x89, 0x7b, 0xf2, 0x0c, 0x2b, 0x9e, 0x6f, 0xd0, 0x62, 0x0c, 0x82, 0x6a, 0xb7, + 0xb2, 0x6c, 0x7a, 0xbe, 0x41, 0x0b, 0x61, 0x70, 0xd7, 0xf3, 0x0d, 0x5a, 0x6a, 0x48, 0x5e, 0xd2, + 0x05, 0x99, 0xa5, 0x0b, 0xf1, 0x14, 0x9a, 0xdb, 0x95, 0x24, 0xb9, 0xc4, 0xd1, 0x84, 0x82, 0x52, + 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x8d, 0x9a, 0x18, 0xb9, 0x98, 0x7d, 0x8b, 0xd3, 0x85, 0x4a, + 0xb8, 0x78, 0x50, 0xbc, 0xab, 0x8b, 0xdf, 0x99, 0x68, 0xc6, 0x49, 0x99, 0x92, 0xa4, 0x1c, 0x66, + 0xbb, 0x14, 0x6b, 0x03, 0xc8, 0x8b, 0x4e, 0x41, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, + 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, + 0xc7, 0x10, 0x65, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xb5, + 0x41, 0x37, 0xbf, 0x28, 0x1d, 0xc6, 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x40, 0xf7, 0x7d, 0x49, 0x65, + 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0x2a, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd2, 0xe4, + 0xe9, 0x9d, 0xd9, 0x02, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// MsgClient is the client API for Msg service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type MsgClient interface { + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) +} + +type msgClient struct { + cc grpc1.ClientConn +} + +func NewMsgClient(cc grpc1.ClientConn) MsgClient { + return &msgClient{cc} +} + +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/neutron.ibcratelimit.v1beta1.Msg/UpdateParams", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// MsgServer is the server API for Msg service. +type MsgServer interface { + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) +} + +// UnimplementedMsgServer can be embedded to have forward compatible implementations. +type UnimplementedMsgServer struct { +} + +func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") +} + +func RegisterMsgServer(s grpc1.Server, srv MsgServer) { + s.RegisterService(&_Msg_serviceDesc, srv) +} + +func _Msg_UpdateParams_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUpdateParams) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).UpdateParams(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/neutron.ibcratelimit.v1beta1.Msg/UpdateParams", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) + } + return interceptor(ctx, in, info, handler) +} + +var _Msg_serviceDesc = grpc.ServiceDesc{ + ServiceName: "neutron.ibcratelimit.v1beta1.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "neutron/ibcratelimit/v1beta1/tx.proto", +} + +func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgUpdateParams) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Authority) > 0 { + i -= len(m.Authority) + copy(dAtA[i:], m.Authority) + i = encodeVarintTx(dAtA, i, uint64(len(m.Authority))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUpdateParamsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgUpdateParamsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func encodeVarintTx(dAtA []byte, offset int, v uint64) int { + offset -= sovTx(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *MsgUpdateParams) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Authority) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.Params.Size() + n += 1 + l + sovTx(uint64(l)) + return n +} + +func (m *MsgUpdateParamsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func sovTx(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozTx(x uint64) (n int) { + return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateParams: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Authority", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Authority = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateParamsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipTx(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTx + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTx + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTx + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthTx + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTx + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthTx + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthTx = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTx = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTx = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/interchainqueries/client/cli/query.go b/x/interchainqueries/client/cli/query.go index 9ceee5da5..90f6fea84 100644 --- a/x/interchainqueries/client/cli/query.go +++ b/x/interchainqueries/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) const ( diff --git a/x/interchainqueries/client/cli/query_params.go b/x/interchainqueries/client/cli/query_params.go index b7c679073..4fb95a5d9 100644 --- a/x/interchainqueries/client/cli/query_params.go +++ b/x/interchainqueries/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/interchainqueries/client/cli/tx.go b/x/interchainqueries/client/cli/tx.go index e70f5477d..4e30ec8a7 100644 --- a/x/interchainqueries/client/cli/tx.go +++ b/x/interchainqueries/client/cli/tx.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/interchainqueries/genesis.go b/x/interchainqueries/genesis.go index 4f7d837ba..5cdad98c1 100644 --- a/x/interchainqueries/genesis.go +++ b/x/interchainqueries/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/interchainqueries/genesis_test.go b/x/interchainqueries/genesis_test.go index 2313d60e4..e93f123ca 100644 --- a/x/interchainqueries/genesis_test.go +++ b/x/interchainqueries/genesis_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func TestGenesis(t *testing.T) { diff --git a/x/interchainqueries/keeper/grpc_query.go b/x/interchainqueries/keeper/grpc_query.go index eef0fb642..767109134 100644 --- a/x/interchainqueries/keeper/grpc_query.go +++ b/x/interchainqueries/keeper/grpc_query.go @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/interchainqueries/keeper/grpc_query_params.go b/x/interchainqueries/keeper/grpc_query_params.go index d0316c257..3c3cc971c 100644 --- a/x/interchainqueries/keeper/grpc_query_params.go +++ b/x/interchainqueries/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/interchainqueries/keeper/grpc_query_params_test.go b/x/interchainqueries/keeper/grpc_query_params_test.go index f1de7e024..015d701fe 100644 --- a/x/interchainqueries/keeper/grpc_query_params_test.go +++ b/x/interchainqueries/keeper/grpc_query_params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/interchainqueries/keeper/grpc_query_test.go b/x/interchainqueries/keeper/grpc_query_test.go index bf3849e87..0f9908fd3 100644 --- a/x/interchainqueries/keeper/grpc_query_test.go +++ b/x/interchainqueries/keeper/grpc_query_test.go @@ -12,8 +12,8 @@ import ( ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" - "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - iqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + iqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func (suite *KeeperTestSuite) TestRemoteLastHeight() { diff --git a/x/interchainqueries/keeper/keeper.go b/x/interchainqueries/keeper/keeper.go index e22fd27e1..4a39fbadb 100644 --- a/x/interchainqueries/keeper/keeper.go +++ b/x/interchainqueries/keeper/keeper.go @@ -15,7 +15,7 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" tendermintLightClientTypes "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) const ( diff --git a/x/interchainqueries/keeper/keeper_test.go b/x/interchainqueries/keeper/keeper_test.go index 6a7a61a2f..9ac2b5228 100644 --- a/x/interchainqueries/keeper/keeper_test.go +++ b/x/interchainqueries/keeper/keeper_test.go @@ -12,7 +12,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" wasmKeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" abci "github.com/cometbft/cometbft/abci/types" @@ -21,9 +21,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - iqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + iqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) var reflectContractPath = "../../../wasmbinding/testdata/reflect.wasm" diff --git a/x/interchainqueries/keeper/migrations.go b/x/interchainqueries/keeper/migrations.go index a036ea33e..01beba7f0 100644 --- a/x/interchainqueries/keeper/migrations.go +++ b/x/interchainqueries/keeper/migrations.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - v3 "github.com/neutron-org/neutron/v4/x/interchainqueries/migrations/v3" + v3 "github.com/neutron-org/neutron/v5/x/interchainqueries/migrations/v3" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/interchainqueries/keeper/msg_server.go b/x/interchainqueries/keeper/msg_server.go index 5b3cc345a..50f30fa97 100644 --- a/x/interchainqueries/keeper/msg_server.go +++ b/x/interchainqueries/keeper/msg_server.go @@ -18,7 +18,7 @@ import ( ibccommitmenttypes "github.com/cosmos/ibc-go/v8/modules/core/23-commitment/types" ics23 "github.com/cosmos/ics23/go" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/interchainqueries/keeper/msg_server_test.go b/x/interchainqueries/keeper/msg_server_test.go index ce8f9fe60..26b30bc94 100644 --- a/x/interchainqueries/keeper/msg_server_test.go +++ b/x/interchainqueries/keeper/msg_server_test.go @@ -8,10 +8,10 @@ import ( ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/testutil" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func TestMsgRegisterInterchainQueryValidate(t *testing.T) { diff --git a/x/interchainqueries/keeper/params.go b/x/interchainqueries/keeper/params.go index a9622d2ad..c955a9f4c 100644 --- a/x/interchainqueries/keeper/params.go +++ b/x/interchainqueries/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // GetParams get all parameters as types.Params diff --git a/x/interchainqueries/keeper/params_test.go b/x/interchainqueries/keeper/params_test.go index 37320eed8..e99112909 100644 --- a/x/interchainqueries/keeper/params_test.go +++ b/x/interchainqueries/keeper/params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func TestGetParams(t *testing.T) { diff --git a/x/interchainqueries/keeper/process_block_results.go b/x/interchainqueries/keeper/process_block_results.go index 566bf48df..a45bf6d7e 100644 --- a/x/interchainqueries/keeper/process_block_results.go +++ b/x/interchainqueries/keeper/process_block_results.go @@ -17,7 +17,7 @@ import ( "github.com/cosmos/ibc-go/v8/modules/core/exported" tendermintLightClientTypes "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // deterministicExecTxResult strips non-deterministic fields from diff --git a/x/interchainqueries/keeper/process_block_results_test.go b/x/interchainqueries/keeper/process_block_results_test.go index 1c218675f..fd9205b8a 100644 --- a/x/interchainqueries/keeper/process_block_results_test.go +++ b/x/interchainqueries/keeper/process_block_results_test.go @@ -10,8 +10,8 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" "github.com/golang/mock/gomock" - icqtestkeeper "github.com/neutron-org/neutron/v4/testutil/interchainqueries/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/interchainqueries/types" + icqtestkeeper "github.com/neutron-org/neutron/v5/testutil/interchainqueries/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/interchainqueries/types" "github.com/CosmWasm/wasmd/x/wasm/keeper" "github.com/cometbft/cometbft/crypto/tmhash" @@ -29,9 +29,9 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" clientkeeper "github.com/cosmos/ibc-go/v8/modules/core/02-client/keeper" - "github.com/neutron-org/neutron/v4/testutil" - iqkeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - iqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/testutil" + iqkeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + iqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // CreateTMClientHeader creates a TM header to update the TM client. Args are passed in to allow diff --git a/x/interchainqueries/migrations/v3/migration.go b/x/interchainqueries/migrations/v3/migration.go index a77e4bed8..4f04d83f9 100644 --- a/x/interchainqueries/migrations/v3/migration.go +++ b/x/interchainqueries/migrations/v3/migration.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func MigrateParams(ctx sdk.Context, cdc codec.BinaryCodec, storeKey store.StoreKey) error { diff --git a/x/interchainqueries/migrations/v3/migration_test.go b/x/interchainqueries/migrations/v3/migration_test.go index c36014df8..48dbd558a 100644 --- a/x/interchainqueries/migrations/v3/migration_test.go +++ b/x/interchainqueries/migrations/v3/migration_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/suite" "gopkg.in/yaml.v2" - "github.com/neutron-org/neutron/v4/testutil" - v3 "github.com/neutron-org/neutron/v4/x/interchainqueries/migrations/v3" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/testutil" + v3 "github.com/neutron-org/neutron/v5/x/interchainqueries/migrations/v3" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) type V3ICQMigrationTestSuite struct { diff --git a/x/interchainqueries/module.go b/x/interchainqueries/module.go index cf1572bd7..b97573a14 100644 --- a/x/interchainqueries/module.go +++ b/x/interchainqueries/module.go @@ -19,9 +19,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchainqueries/client/cli" - "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/client/cli" + "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) var ( diff --git a/x/interchainqueries/module_simulation.go b/x/interchainqueries/module_simulation.go index 64d6877f6..a077a9073 100644 --- a/x/interchainqueries/module_simulation.go +++ b/x/interchainqueries/module_simulation.go @@ -7,9 +7,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/neutron-org/neutron/v4/testutil/common/sample" - interchainqueriessimulation "github.com/neutron-org/neutron/v4/x/interchainqueries/simulation" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/testutil/common/sample" + interchainqueriessimulation "github.com/neutron-org/neutron/v5/x/interchainqueries/simulation" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) // avoid unused import issue diff --git a/x/interchainqueries/types/genesis.pb.go b/x/interchainqueries/types/genesis.pb.go index 1af0782c0..94451d85e 100644 --- a/x/interchainqueries/types/genesis.pb.go +++ b/x/interchainqueries/types/genesis.pb.go @@ -292,44 +292,44 @@ var fileDescriptor_ed312d37df0260a6 = []byte{ // 638 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xcd, 0x6e, 0xd3, 0x40, 0x10, 0x8e, 0xd3, 0xb4, 0x25, 0x9b, 0xb4, 0xc0, 0xd2, 0x83, 0x5b, 0x09, 0x27, 0xa4, 0x02, 0x22, - 0xa4, 0x7a, 0x9b, 0xd2, 0x1b, 0x07, 0x44, 0x91, 0xf8, 0x2b, 0x87, 0xe2, 0x16, 0x24, 0xb8, 0x58, - 0xfe, 0x19, 0x9c, 0x55, 0x93, 0x5d, 0xb3, 0xbb, 0x0e, 0xf8, 0x2d, 0x78, 0x8e, 0x3e, 0x49, 0x8f, - 0x3d, 0x72, 0x02, 0xd4, 0x3e, 0x07, 0x12, 0xf2, 0xd8, 0xa1, 0x05, 0xd2, 0x9e, 0x3c, 0xfe, 0xf6, - 0x9b, 0x6f, 0x67, 0x67, 0xbe, 0x21, 0xf7, 0x05, 0x64, 0x46, 0x49, 0xc1, 0xb8, 0x30, 0xa0, 0xa2, - 0x61, 0xc0, 0xc5, 0xa7, 0x0c, 0x14, 0x07, 0xcd, 0x12, 0x10, 0xa0, 0xb9, 0x76, 0x53, 0x25, 0x8d, - 0xa4, 0xab, 0x15, 0xd1, 0xfd, 0x8f, 0xb8, 0xe6, 0x44, 0x52, 0x8f, 0xa5, 0x66, 0x61, 0xa0, 0x81, - 0x4d, 0x06, 0x21, 0x98, 0x60, 0xc0, 0x22, 0xc9, 0x45, 0x99, 0xba, 0xb6, 0x92, 0xc8, 0x44, 0x62, - 0xc8, 0x8a, 0xa8, 0x42, 0x3b, 0x3c, 0x8c, 0x58, 0x24, 0x15, 0xb0, 0x68, 0xc4, 0x41, 0x18, 0x36, - 0x19, 0x54, 0x51, 0x45, 0xb8, 0x77, 0x79, 0x69, 0x69, 0xa0, 0x82, 0x71, 0x55, 0x59, 0xef, 0x57, - 0x83, 0x5c, 0xf7, 0x20, 0xe1, 0xda, 0x80, 0x82, 0xf8, 0x4d, 0x06, 0x2a, 0xa7, 0xcb, 0xa4, 0xce, - 0x63, 0xdb, 0xea, 0x5a, 0xfd, 0x86, 0x57, 0xe7, 0x31, 0x5d, 0x21, 0xf3, 0xf2, 0xb3, 0x00, 0x65, - 0xd7, 0xbb, 0x56, 0xbf, 0xe9, 0x95, 0x3f, 0xf4, 0x36, 0x21, 0x85, 0x62, 0xee, 0x9b, 0x3c, 0x05, - 0x7b, 0x0e, 0x8f, 0x9a, 0x88, 0x1c, 0xe4, 0x29, 0xd0, 0x6d, 0xd2, 0x38, 0x84, 0x5c, 0xdb, 0x8d, - 0xee, 0x5c, 0xbf, 0xb5, 0xd5, 0x75, 0x2f, 0xed, 0x80, 0xbb, 0xfb, 0x6e, 0x17, 0x72, 0x0f, 0xd9, - 0x94, 0x91, 0x5b, 0x46, 0x05, 0x42, 0x07, 0x91, 0xe1, 0x52, 0x68, 0xff, 0x23, 0x1f, 0x19, 0x50, - 0xf6, 0x3c, 0xaa, 0xd3, 0x8b, 0x47, 0xcf, 0xf0, 0x84, 0xae, 0x93, 0xa5, 0x48, 0x0a, 0x01, 0x08, - 0xfa, 0x3c, 0xb6, 0x17, 0x90, 0xda, 0x3e, 0x07, 0x5f, 0xc6, 0x05, 0x29, 0x4b, 0xe3, 0xc0, 0x80, - 0x9f, 0x82, 0xe2, 0x32, 0xb6, 0x17, 0xf1, 0x6d, 0xed, 0x12, 0xdc, 0x43, 0x8c, 0xbe, 0x22, 0xbd, - 0x51, 0xa0, 0x8d, 0xaf, 0xb3, 0x70, 0xcc, 0x8d, 0x81, 0xd8, 0x57, 0xa0, 0xb3, 0x91, 0xf1, 0x47, - 0x32, 0x0a, 0x46, 0xfe, 0x10, 0x78, 0x32, 0x34, 0xf6, 0x35, 0xcc, 0x74, 0x0a, 0xe6, 0xfe, 0x94, - 0xe8, 0x21, 0xef, 0x75, 0x41, 0x7b, 0x81, 0x2c, 0x3a, 0x24, 0xeb, 0xb3, 0xb5, 0x14, 0x8c, 0xa5, - 0x81, 0xa9, 0x58, 0xb3, 0x6b, 0xf5, 0x5b, 0x5b, 0x6b, 0x2e, 0x0f, 0x23, 0xb7, 0x18, 0xa6, 0x5b, - 0x8d, 0x70, 0x32, 0x70, 0x4b, 0x21, 0xaf, 0x33, 0xe3, 0x22, 0x0f, 0x35, 0xaa, 0x9b, 0x80, 0x2c, - 0xc6, 0x90, 0x4a, 0xcd, 0x8d, 0x4d, 0xb0, 0xd3, 0xab, 0x6e, 0x69, 0x28, 0xb7, 0x30, 0x94, 0x5b, - 0x19, 0xca, 0x7d, 0x2a, 0xb9, 0xd8, 0xd9, 0x3c, 0xfe, 0xde, 0xa9, 0x1d, 0xfd, 0xe8, 0xf4, 0x13, - 0x6e, 0x86, 0x59, 0xe8, 0x46, 0x72, 0xcc, 0x2a, 0xf7, 0x95, 0x9f, 0x0d, 0x1d, 0x1f, 0xb2, 0x62, - 0x9c, 0x1a, 0x13, 0xb4, 0x37, 0xd5, 0xa6, 0x77, 0xc9, 0x72, 0xf9, 0x16, 0xdf, 0xf0, 0x31, 0xc8, - 0xcc, 0xd8, 0x2d, 0x6c, 0xc4, 0x52, 0x89, 0x1e, 0x94, 0x20, 0xdd, 0x24, 0x2b, 0xea, 0x8f, 0x99, - 0xfc, 0xc0, 0x4c, 0x1f, 0xda, 0x46, 0x32, 0x3d, 0x3f, 0x7b, 0x62, 0xca, 0xfa, 0x7b, 0x1b, 0x64, - 0x1e, 0xe7, 0x4f, 0x29, 0x69, 0xa4, 0x81, 0x19, 0xa2, 0xed, 0x9a, 0x1e, 0xc6, 0xf4, 0x06, 0x99, - 0x3b, 0x84, 0x1c, 0x6d, 0xd7, 0xf6, 0x8a, 0xb0, 0x77, 0x64, 0x91, 0xf6, 0xf3, 0x72, 0xb5, 0xf6, - 0x4d, 0x60, 0x80, 0x3e, 0x26, 0x0b, 0xa5, 0x9f, 0x31, 0xb1, 0xb5, 0x75, 0xe7, 0x0a, 0xa3, 0xed, - 0x21, 0x71, 0xa7, 0x51, 0xb4, 0xc1, 0xab, 0xd2, 0xe8, 0x7b, 0x72, 0xa1, 0x2c, 0xbf, 0xa2, 0xda, - 0x75, 0xec, 0xe5, 0x83, 0x2b, 0xc4, 0xfe, 0x59, 0x1a, 0xef, 0xa6, 0xfa, 0x0b, 0xe0, 0xa0, 0x77, - 0xde, 0x1e, 0x9f, 0x3a, 0xd6, 0xc9, 0xa9, 0x63, 0xfd, 0x3c, 0x75, 0xac, 0xaf, 0x67, 0x4e, 0xed, - 0xe4, 0xcc, 0xa9, 0x7d, 0x3b, 0x73, 0x6a, 0x1f, 0x1e, 0x5d, 0x98, 0x40, 0x75, 0xc5, 0x86, 0x54, - 0xc9, 0x34, 0x66, 0x93, 0x6d, 0xf6, 0x65, 0xc6, 0xe6, 0xe2, 0x68, 0xc2, 0x05, 0xdc, 0xdc, 0x87, - 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x34, 0x51, 0x13, 0x7e, 0x04, 0x00, 0x00, + 0xa4, 0x7a, 0x9b, 0x02, 0x27, 0x0e, 0x88, 0x22, 0xf1, 0x57, 0x0e, 0xc5, 0x2d, 0x48, 0x70, 0xb1, + 0xfc, 0x33, 0x38, 0xab, 0x26, 0xbb, 0x66, 0x77, 0x1d, 0xf0, 0x5b, 0xf0, 0x1c, 0x7d, 0x92, 0x1e, + 0x7b, 0xe4, 0x04, 0xa8, 0x7d, 0x0e, 0x24, 0xe4, 0xb1, 0x43, 0x0b, 0xa4, 0x3d, 0x79, 0xfc, 0xed, + 0x37, 0xdf, 0xce, 0xce, 0x7c, 0x43, 0xee, 0x0a, 0xc8, 0x8c, 0x92, 0x82, 0x71, 0x61, 0x40, 0x45, + 0xc3, 0x80, 0x8b, 0x4f, 0x19, 0x28, 0x0e, 0x9a, 0x25, 0x20, 0x40, 0x73, 0xed, 0xa6, 0x4a, 0x1a, + 0x49, 0x57, 0x2b, 0xa2, 0xfb, 0x1f, 0x71, 0xcd, 0x89, 0xa4, 0x1e, 0x4b, 0xcd, 0xc2, 0x40, 0x03, + 0x9b, 0x0c, 0x42, 0x30, 0xc1, 0x80, 0x45, 0x92, 0x8b, 0x32, 0x75, 0x6d, 0x25, 0x91, 0x89, 0xc4, + 0x90, 0x15, 0x51, 0x85, 0x76, 0x78, 0x18, 0xb1, 0x48, 0x2a, 0x60, 0xd1, 0x88, 0x83, 0x30, 0x6c, + 0x32, 0xa8, 0xa2, 0x8a, 0x70, 0xe7, 0xe2, 0xd2, 0xd2, 0x40, 0x05, 0xe3, 0xaa, 0xb2, 0xde, 0xaf, + 0x06, 0xb9, 0xea, 0x41, 0xc2, 0xb5, 0x01, 0x05, 0xf1, 0x9b, 0x0c, 0x54, 0x4e, 0x97, 0x49, 0x9d, + 0xc7, 0xb6, 0xd5, 0xb5, 0xfa, 0x0d, 0xaf, 0xce, 0x63, 0xba, 0x42, 0xe6, 0xe5, 0x67, 0x01, 0xca, + 0xae, 0x77, 0xad, 0x7e, 0xd3, 0x2b, 0x7f, 0xe8, 0x4d, 0x42, 0x0a, 0xc5, 0xdc, 0x37, 0x79, 0x0a, + 0xf6, 0x1c, 0x1e, 0x35, 0x11, 0xd9, 0xcf, 0x53, 0xa0, 0x0f, 0x48, 0xe3, 0x00, 0x72, 0x6d, 0x37, + 0xba, 0x73, 0xfd, 0xd6, 0x56, 0xd7, 0xbd, 0xb0, 0x03, 0xee, 0xce, 0xbb, 0x1d, 0xc8, 0x3d, 0x64, + 0x53, 0x46, 0x6e, 0x18, 0x15, 0x08, 0x1d, 0x44, 0x86, 0x4b, 0xa1, 0xfd, 0x8f, 0x7c, 0x64, 0x40, + 0xd9, 0xf3, 0xa8, 0x4e, 0xcf, 0x1f, 0x3d, 0xc3, 0x13, 0xba, 0x4e, 0x96, 0x22, 0x29, 0x04, 0x20, + 0xe8, 0xf3, 0xd8, 0x5e, 0x40, 0x6a, 0xfb, 0x0c, 0x7c, 0x19, 0x17, 0xa4, 0x2c, 0x8d, 0x03, 0x03, + 0x7e, 0x0a, 0x8a, 0xcb, 0xd8, 0x5e, 0xc4, 0xb7, 0xb5, 0x4b, 0x70, 0x17, 0x31, 0xfa, 0x8a, 0xf4, + 0x46, 0x81, 0x36, 0xbe, 0xce, 0xc2, 0x31, 0x37, 0x06, 0x62, 0x5f, 0x81, 0xce, 0x46, 0xc6, 0x1f, + 0xc9, 0x28, 0x18, 0xf9, 0x43, 0xe0, 0xc9, 0xd0, 0xd8, 0x57, 0x30, 0xd3, 0x29, 0x98, 0x7b, 0x53, + 0xa2, 0x87, 0xbc, 0xd7, 0x05, 0xed, 0x05, 0xb2, 0xe8, 0x90, 0xac, 0xcf, 0xd6, 0x52, 0x30, 0x96, + 0x06, 0xa6, 0x62, 0xcd, 0xae, 0xd5, 0x6f, 0x6d, 0xad, 0xb9, 0x3c, 0x8c, 0xdc, 0x62, 0x98, 0x6e, + 0x35, 0xc2, 0xc9, 0xc0, 0x2d, 0x85, 0xbc, 0xce, 0x8c, 0x8b, 0x3c, 0xd4, 0xa8, 0x6e, 0x02, 0xb2, + 0x18, 0x43, 0x2a, 0x35, 0x37, 0x36, 0xc1, 0x4e, 0xaf, 0xba, 0xa5, 0xa1, 0xdc, 0xc2, 0x50, 0x6e, + 0x65, 0x28, 0xf7, 0xa9, 0xe4, 0x62, 0x7b, 0xf3, 0xe8, 0x7b, 0xa7, 0x76, 0xf8, 0xa3, 0xd3, 0x4f, + 0xb8, 0x19, 0x66, 0xa1, 0x1b, 0xc9, 0x31, 0xab, 0xdc, 0x57, 0x7e, 0x36, 0x74, 0x7c, 0xc0, 0x8a, + 0x71, 0x6a, 0x4c, 0xd0, 0xde, 0x54, 0x9b, 0xde, 0x26, 0xcb, 0xe5, 0x5b, 0x7c, 0xc3, 0xc7, 0x20, + 0x33, 0x63, 0xb7, 0xb0, 0x11, 0x4b, 0x25, 0xba, 0x5f, 0x82, 0x74, 0x93, 0xac, 0xa8, 0x3f, 0x66, + 0xf2, 0x03, 0x33, 0x7d, 0x68, 0x1b, 0xc9, 0xf4, 0xec, 0xec, 0x89, 0x29, 0xeb, 0xef, 0x6d, 0x90, + 0x79, 0x9c, 0x3f, 0xa5, 0xa4, 0x91, 0x06, 0x66, 0x88, 0xb6, 0x6b, 0x7a, 0x18, 0xd3, 0x6b, 0x64, + 0xee, 0x00, 0x72, 0xb4, 0x5d, 0xdb, 0x2b, 0xc2, 0xde, 0xa1, 0x45, 0xda, 0xcf, 0xcb, 0xd5, 0xda, + 0x33, 0x81, 0x01, 0xfa, 0x98, 0x2c, 0x94, 0x7e, 0xc6, 0xc4, 0xd6, 0xd6, 0xad, 0x4b, 0x8c, 0xb6, + 0x8b, 0xc4, 0xed, 0x46, 0xd1, 0x06, 0xaf, 0x4a, 0xa3, 0xef, 0xc9, 0xb9, 0xb2, 0xfc, 0x8a, 0x6a, + 0xd7, 0xb1, 0x97, 0xf7, 0x2e, 0x11, 0xfb, 0x67, 0x69, 0xbc, 0xeb, 0xea, 0x2f, 0x80, 0x83, 0xde, + 0x7e, 0x7b, 0x74, 0xe2, 0x58, 0xc7, 0x27, 0x8e, 0xf5, 0xf3, 0xc4, 0xb1, 0xbe, 0x9e, 0x3a, 0xb5, + 0xe3, 0x53, 0xa7, 0xf6, 0xed, 0xd4, 0xa9, 0x7d, 0x78, 0x74, 0x6e, 0x02, 0xd5, 0x15, 0x1b, 0x52, + 0x25, 0xd3, 0x98, 0x4d, 0x1e, 0xb2, 0x2f, 0x33, 0x36, 0x17, 0x47, 0x13, 0x2e, 0xe0, 0xe6, 0xde, + 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x23, 0xcf, 0xdc, 0x7e, 0x04, 0x00, 0x00, } func (m *RegisteredQuery) Marshal() (dAtA []byte, err error) { diff --git a/x/interchainqueries/types/genesis_test.go b/x/interchainqueries/types/genesis_test.go index a4e0956a4..0fdb5b122 100644 --- a/x/interchainqueries/types/genesis_test.go +++ b/x/interchainqueries/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/interchainqueries/types/params.go b/x/interchainqueries/types/params.go index 063cefc28..fa598c216 100644 --- a/x/interchainqueries/types/params.go +++ b/x/interchainqueries/types/params.go @@ -8,7 +8,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "gopkg.in/yaml.v2" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" ) var _ paramtypes.ParamSet = (*Params)(nil) diff --git a/x/interchainqueries/types/params.pb.go b/x/interchainqueries/types/params.pb.go index 18d044b6f..ef23f50c8 100644 --- a/x/interchainqueries/types/params.pb.go +++ b/x/interchainqueries/types/params.pb.go @@ -119,31 +119,31 @@ func init() { var fileDescriptor_752a5f3346da64b1 = []byte{ // 397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x31, 0x8f, 0xd3, 0x30, - 0x14, 0xc7, 0x93, 0xbb, 0x72, 0x43, 0x80, 0x25, 0x9c, 0x8e, 0x5c, 0x87, 0xb4, 0x62, 0x40, 0x5d, - 0x1a, 0xb7, 0xb4, 0x03, 0x82, 0xad, 0x45, 0x2c, 0x65, 0x80, 0x52, 0x16, 0x96, 0xc8, 0x49, 0x4d, - 0x6a, 0xb5, 0xf6, 0x0b, 0xf6, 0x4b, 0x94, 0x7c, 0x0b, 0x46, 0x46, 0x66, 0x3e, 0x49, 0xc7, 0x6e, - 0x30, 0x01, 0x6a, 0xbf, 0x08, 0x8a, 0x1d, 0xa4, 0x4a, 0xdc, 0x94, 0xa7, 0xfc, 0xfc, 0xcb, 0xff, - 0x9f, 0xbc, 0x78, 0x4f, 0x25, 0x2b, 0x50, 0x81, 0x24, 0x5c, 0x22, 0x53, 0xe9, 0x86, 0x72, 0xf9, - 0xb9, 0x60, 0x8a, 0x33, 0x4d, 0x72, 0xaa, 0xa8, 0xd0, 0x51, 0xae, 0x00, 0xc1, 0xbf, 0x6d, 0xcf, - 0x45, 0xff, 0x9d, 0xeb, 0x86, 0x29, 0x68, 0x01, 0x9a, 0x24, 0x54, 0x33, 0x52, 0x8e, 0x13, 0x86, - 0x74, 0x4c, 0x52, 0xe0, 0xd2, 0xaa, 0xdd, 0xeb, 0x0c, 0x32, 0x30, 0x23, 0x69, 0x26, 0x7b, 0xf7, - 0xc9, 0x8f, 0x0b, 0xef, 0xea, 0xad, 0x49, 0xf0, 0x47, 0xde, 0x75, 0xf3, 0xac, 0x3a, 0xd6, 0x45, - 0x22, 0x38, 0xc6, 0xc8, 0x05, 0x83, 0x02, 0x03, 0xb7, 0xef, 0x0e, 0x3a, 0x4b, 0xdf, 0xb0, 0xf7, - 0x06, 0xad, 0x2c, 0xf1, 0x73, 0xef, 0xa1, 0x35, 0xd6, 0x2c, 0x07, 0xcd, 0x31, 0xb8, 0xe8, 0x5f, - 0x0e, 0xee, 0x3f, 0xbb, 0x8d, 0x6c, 0x95, 0xa8, 0xa9, 0x12, 0xb5, 0x55, 0xa2, 0x39, 0x70, 0x39, - 0x1b, 0xed, 0x7f, 0xf5, 0x9c, 0xef, 0xbf, 0x7b, 0x83, 0x8c, 0xe3, 0xa6, 0x48, 0xa2, 0x14, 0x04, - 0x69, 0x7b, 0xdb, 0xcb, 0x50, 0xaf, 0xb7, 0x04, 0xeb, 0x9c, 0x69, 0x23, 0xe8, 0xe5, 0x03, 0x93, - 0xf0, 0xca, 0x06, 0xf8, 0x13, 0xef, 0x06, 0xab, 0xd8, 0x86, 0x2a, 0x26, 0xa0, 0xa4, 0xbb, 0x78, - 0xc7, 0x05, 0xc7, 0xe0, 0xd2, 0xb4, 0x7c, 0x84, 0xd5, 0xbb, 0x06, 0x2e, 0x2d, 0x7b, 0xd3, 0x20, - 0x7f, 0xea, 0x3d, 0x16, 0xb4, 0x8a, 0xb7, 0x65, 0x2b, 0x6e, 0x59, 0xad, 0xe3, 0x14, 0x0a, 0x89, - 0x41, 0xc7, 0x5a, 0x82, 0x56, 0x8b, 0xd2, 0x88, 0x0b, 0x56, 0xeb, 0x79, 0x83, 0xfc, 0xe7, 0x5e, - 0xd0, 0x58, 0xa8, 0xa8, 0xd4, 0x34, 0x45, 0x0e, 0x52, 0xc7, 0x9f, 0xf8, 0x0e, 0x99, 0xd2, 0xc1, - 0x3d, 0xa3, 0xdd, 0x08, 0x5a, 0xad, 0xce, 0xf0, 0x6b, 0x4b, 0x5f, 0x74, 0xbe, 0x7e, 0xeb, 0x39, - 0xb3, 0x0f, 0xfb, 0x63, 0xe8, 0x1e, 0x8e, 0xa1, 0xfb, 0xe7, 0x18, 0xba, 0x5f, 0x4e, 0xa1, 0x73, - 0x38, 0x85, 0xce, 0xcf, 0x53, 0xe8, 0x7c, 0x7c, 0x79, 0xf6, 0xf2, 0xed, 0x3e, 0x87, 0xa0, 0xb2, - 0x7f, 0x33, 0x29, 0xa7, 0xa4, 0xba, 0xe3, 0x47, 0x30, 0x5f, 0x25, 0xb9, 0x32, 0x7b, 0x9b, 0xfc, - 0x0d, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x38, 0x73, 0xdc, 0x32, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xb1, 0xae, 0xd3, 0x30, + 0x14, 0x86, 0x93, 0x7b, 0xcb, 0x1d, 0x02, 0x2c, 0xe1, 0xea, 0x92, 0x76, 0x48, 0x2b, 0x06, 0xd4, + 0xa5, 0x71, 0x4b, 0x41, 0x42, 0xb0, 0xb5, 0x88, 0xa5, 0x0c, 0x50, 0xca, 0xc2, 0x12, 0x39, 0xa9, + 0x49, 0xad, 0xd6, 0x3e, 0xc1, 0x3e, 0x89, 0x92, 0xb7, 0x60, 0x64, 0x64, 0xe6, 0x49, 0x3a, 0x76, + 0x83, 0x09, 0x50, 0xfb, 0x22, 0x28, 0x76, 0x90, 0x2a, 0x71, 0xa7, 0x1c, 0xe5, 0xf3, 0x97, 0xff, + 0x4f, 0x4e, 0xbc, 0xc7, 0x92, 0x15, 0xa8, 0x40, 0x12, 0x2e, 0x91, 0xa9, 0x74, 0x43, 0xb9, 0xfc, + 0x5c, 0x30, 0xc5, 0x99, 0x26, 0x39, 0x55, 0x54, 0xe8, 0x28, 0x57, 0x80, 0xe0, 0x77, 0xdb, 0x73, + 0xd1, 0x7f, 0xe7, 0x7a, 0x61, 0x0a, 0x5a, 0x80, 0x26, 0x09, 0xd5, 0x8c, 0x94, 0x93, 0x84, 0x21, + 0x9d, 0x90, 0x14, 0xb8, 0xb4, 0x6a, 0xef, 0x3a, 0x83, 0x0c, 0xcc, 0x48, 0x9a, 0xc9, 0xde, 0x7d, + 0xf4, 0xe3, 0xc2, 0xbb, 0x7a, 0x6b, 0x12, 0xfc, 0xb1, 0x77, 0xdd, 0x3c, 0xab, 0x8e, 0x75, 0x91, + 0x08, 0x8e, 0x31, 0x72, 0xc1, 0xa0, 0xc0, 0xc0, 0x1d, 0xb8, 0xc3, 0xce, 0xd2, 0x37, 0xec, 0xbd, + 0x41, 0x2b, 0x4b, 0xfc, 0xdc, 0xbb, 0x6f, 0x8d, 0x35, 0xcb, 0x41, 0x73, 0x0c, 0x2e, 0x06, 0x97, + 0xc3, 0xbb, 0x4f, 0xba, 0x91, 0xad, 0x12, 0x35, 0x55, 0xa2, 0xb6, 0x4a, 0x34, 0x07, 0x2e, 0x67, + 0xe3, 0xfd, 0xaf, 0xbe, 0xf3, 0xfd, 0x77, 0x7f, 0x98, 0x71, 0xdc, 0x14, 0x49, 0x94, 0x82, 0x20, + 0x6d, 0x6f, 0x7b, 0x19, 0xe9, 0xf5, 0x96, 0x60, 0x9d, 0x33, 0x6d, 0x04, 0xbd, 0xbc, 0x67, 0x12, + 0x5e, 0xd9, 0x00, 0x7f, 0xea, 0xdd, 0x60, 0x15, 0xdb, 0x50, 0xc5, 0x04, 0x94, 0x74, 0x17, 0xef, + 0xb8, 0xe0, 0x18, 0x5c, 0x9a, 0x96, 0x0f, 0xb0, 0x7a, 0xd7, 0xc0, 0xa5, 0x65, 0x6f, 0x1a, 0xe4, + 0x3f, 0xf5, 0x1e, 0x0a, 0x5a, 0xc5, 0xdb, 0xb2, 0x15, 0xb7, 0xac, 0xd6, 0x71, 0x0a, 0x85, 0xc4, + 0xa0, 0x63, 0x2d, 0x41, 0xab, 0x45, 0x69, 0xc4, 0x05, 0xab, 0xf5, 0xbc, 0x41, 0xfe, 0x73, 0x2f, + 0x68, 0x2c, 0x54, 0x54, 0x6a, 0x9a, 0x22, 0x07, 0xa9, 0xe3, 0x4f, 0x7c, 0x87, 0x4c, 0xe9, 0xe0, + 0x8e, 0xd1, 0x6e, 0x04, 0xad, 0x56, 0x67, 0xf8, 0xb5, 0xa5, 0x2f, 0x3a, 0x5f, 0xbf, 0xf5, 0x9d, + 0xd9, 0x87, 0xfd, 0x31, 0x74, 0x0f, 0xc7, 0xd0, 0xfd, 0x73, 0x0c, 0xdd, 0x2f, 0xa7, 0xd0, 0x39, + 0x9c, 0x42, 0xe7, 0xe7, 0x29, 0x74, 0x3e, 0xbe, 0x3c, 0x7b, 0xf9, 0x76, 0x9f, 0x23, 0x50, 0xd9, + 0xbf, 0x99, 0x94, 0xcf, 0x48, 0x75, 0xcb, 0x8f, 0x60, 0xbe, 0x4a, 0x72, 0x65, 0xf6, 0x36, 0xfd, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0x47, 0x2f, 0xed, 0x13, 0x32, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/interchainqueries/types/query.pb.go b/x/interchainqueries/types/query.pb.go index 03dd0fb7a..10f7d517d 100644 --- a/x/interchainqueries/types/query.pb.go +++ b/x/interchainqueries/types/query.pb.go @@ -572,52 +572,52 @@ var fileDescriptor_2254be23ba3ff3b4 = []byte{ // 758 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4d, 0x4f, 0x14, 0x4d, 0x10, 0xde, 0x5e, 0xf6, 0x5d, 0x5e, 0x6a, 0x79, 0x5f, 0xa0, 0x45, 0x03, 0x2b, 0xae, 0x30, 0x44, - 0x58, 0x30, 0x3b, 0xc3, 0x87, 0x0a, 0x46, 0xc4, 0x84, 0x83, 0x4a, 0xe2, 0x01, 0x26, 0xe2, 0xc1, - 0xcb, 0xa6, 0x77, 0xb7, 0x33, 0x3b, 0x09, 0xdb, 0xbd, 0xcc, 0xf4, 0x22, 0x73, 0xf5, 0xe6, 0xcd, - 0xe8, 0x5f, 0xf0, 0x07, 0x78, 0xf3, 0xe0, 0xc1, 0x2b, 0xf1, 0x44, 0xe2, 0xc5, 0x93, 0x31, 0xe0, - 0x0f, 0x31, 0xd3, 0xdd, 0xfb, 0xfd, 0xc5, 0x72, 0x9a, 0xee, 0x9e, 0x7a, 0xaa, 0x9e, 0x7a, 0xaa, - 0xaa, 0x1b, 0xee, 0x30, 0x5a, 0x11, 0x1e, 0x67, 0x96, 0xcb, 0x04, 0xf5, 0xf2, 0x45, 0xe2, 0xb2, - 0xa3, 0x0a, 0xf5, 0x5c, 0xea, 0x5b, 0xe1, 0x37, 0x30, 0xcb, 0x1e, 0x17, 0x1c, 0x4f, 0x6b, 0x33, - 0xb3, 0xcd, 0x2c, 0xb9, 0x9c, 0xe7, 0x7e, 0x89, 0xfb, 0x56, 0x8e, 0xf8, 0x54, 0x61, 0xac, 0xe3, - 0xd5, 0x1c, 0x15, 0x64, 0xd5, 0x2a, 0x13, 0xc7, 0x65, 0x44, 0xb8, 0x9c, 0x29, 0x37, 0xc9, 0x49, - 0x87, 0x3b, 0x5c, 0x2e, 0xad, 0x70, 0xa5, 0x4f, 0x67, 0x1c, 0xce, 0x9d, 0x43, 0x6a, 0x91, 0xb2, - 0x6b, 0x11, 0xc6, 0xb8, 0x90, 0x10, 0x5f, 0xff, 0x5d, 0xec, 0xce, 0xd0, 0xa1, 0x8c, 0xfa, 0x6e, - 0xd5, 0x70, 0xa1, 0xbb, 0x61, 0x99, 0x78, 0xa4, 0x54, 0xb5, 0x33, 0xba, 0xdb, 0x89, 0x13, 0x65, - 0x63, 0x4c, 0x02, 0xde, 0x0f, 0x53, 0xd9, 0x93, 0x40, 0x9b, 0x1e, 0x55, 0xa8, 0x2f, 0x8c, 0x57, - 0x70, 0xad, 0xe9, 0xd4, 0x2f, 0x73, 0xe6, 0x53, 0xfc, 0x04, 0xe2, 0x2a, 0xc0, 0x14, 0x9a, 0x45, - 0xe9, 0xc4, 0xda, 0x9c, 0xd9, 0x55, 0x2d, 0x53, 0x41, 0x77, 0x62, 0xa7, 0xbf, 0x6e, 0x47, 0x6c, - 0x0d, 0x33, 0x3e, 0x21, 0xb8, 0x25, 0x1d, 0xdb, 0xd4, 0x71, 0x7d, 0x41, 0x3d, 0x5a, 0xd8, 0x57, - 0xf6, 0x3a, 0x32, 0xbe, 0x01, 0x71, 0xfe, 0x86, 0x51, 0x2f, 0x0c, 0x31, 0x94, 0x1e, 0xb1, 0xf5, - 0x0e, 0xcf, 0xc3, 0x7f, 0x79, 0xce, 0x18, 0xcd, 0x87, 0x8a, 0x65, 0xdd, 0xc2, 0x54, 0x74, 0x16, - 0xa5, 0x47, 0xec, 0xd1, 0xfa, 0xe1, 0x6e, 0x01, 0x3f, 0x05, 0xa8, 0x57, 0x62, 0x6a, 0x48, 0x72, - 0x5c, 0x30, 0x55, 0xd9, 0xcc, 0xb0, 0x6c, 0xa6, 0x2a, 0xb5, 0x2e, 0x9b, 0xb9, 0x47, 0x1c, 0xaa, - 0x03, 0xdb, 0x0d, 0x48, 0xe3, 0x3b, 0x82, 0x54, 0x37, 0x9a, 0x5a, 0x8a, 0x2c, 0x60, 0xaf, 0xf6, - 0x33, 0xab, 0x93, 0x96, 0x9c, 0x13, 0x6b, 0xcb, 0x3d, 0x64, 0x69, 0xf6, 0x18, 0x68, 0x7d, 0x26, - 0xbc, 0xd6, 0x40, 0xf8, 0x59, 0x53, 0x2e, 0x51, 0x99, 0xcb, 0x62, 0xdf, 0x5c, 0x14, 0xbb, 0xa6, - 0x64, 0x36, 0xe1, 0x66, 0x87, 0x5c, 0x82, 0xaa, 0xe0, 0xd3, 0xf0, 0xaf, 0x74, 0x14, 0x6a, 0x1a, - 0x56, 0x35, 0x66, 0x0f, 0xcb, 0xfd, 0x6e, 0xc1, 0xa8, 0xc0, 0x4c, 0x67, 0xa4, 0xd6, 0xe0, 0x00, - 0xc6, 0x5b, 0x34, 0x08, 0x74, 0x63, 0x0c, 0xa0, 0x80, 0x3d, 0xd6, 0x9c, 0x7b, 0x60, 0x6c, 0xc3, - 0x5c, 0x97, 0xb0, 0x95, 0x43, 0x71, 0x09, 0xda, 0x05, 0x30, 0x7a, 0xe1, 0x35, 0xf9, 0x6d, 0x88, - 0x7b, 0xf2, 0x44, 0x53, 0x5e, 0xe8, 0x41, 0xb9, 0x11, 0xaf, 0x51, 0xc6, 0x2e, 0x24, 0x5e, 0x7a, - 0x84, 0xf9, 0x44, 0x36, 0x1f, 0xfe, 0x1f, 0xa2, 0x35, 0x26, 0x51, 0xb7, 0x10, 0xf6, 0x71, 0x91, - 0xba, 0x4e, 0x51, 0xc8, 0xd2, 0xc5, 0x6c, 0xbd, 0xc3, 0x18, 0x62, 0x05, 0x22, 0x88, 0x6c, 0xce, - 0x51, 0x5b, 0xae, 0x8d, 0x2d, 0xb8, 0x2e, 0x23, 0xbc, 0x20, 0xbe, 0xb0, 0x69, 0x89, 0x0b, 0xfa, - 0x5c, 0x19, 0xb7, 0x35, 0x3d, 0x6a, 0x6f, 0x7a, 0x63, 0x43, 0x8f, 0x54, 0x2b, 0xba, 0x96, 0x69, - 0x9d, 0x0a, 0x6a, 0xa4, 0xb2, 0xf6, 0x6e, 0x18, 0xfe, 0x91, 0x48, 0xfc, 0x01, 0x41, 0x5c, 0xcd, - 0x2b, 0xce, 0xf4, 0x93, 0xa1, 0xe9, 0xa2, 0x48, 0x9a, 0x97, 0x35, 0x57, 0x5c, 0x8c, 0xa5, 0xb7, - 0x3f, 0xfe, 0x7c, 0x8c, 0xce, 0xe3, 0x39, 0xab, 0xdf, 0x1d, 0x86, 0xbf, 0x21, 0x98, 0x68, 0x9b, - 0x3f, 0xbc, 0xd9, 0xbf, 0x4c, 0x9d, 0x6f, 0x96, 0xe4, 0xc3, 0x2b, 0x20, 0x35, 0xeb, 0xfb, 0x92, + 0x58, 0x30, 0x3b, 0xc3, 0x47, 0x10, 0x8c, 0x88, 0x09, 0x07, 0x95, 0xc4, 0x03, 0x4c, 0xc4, 0x83, + 0x97, 0x4d, 0xef, 0x6e, 0x67, 0x76, 0x12, 0xb6, 0x7b, 0x99, 0xe9, 0x45, 0xe6, 0xea, 0xcd, 0x9b, + 0xd1, 0xbf, 0xe0, 0x0f, 0xf0, 0xe6, 0xc1, 0x83, 0x57, 0xe2, 0x89, 0xc4, 0x8b, 0x27, 0x63, 0xc0, + 0x1f, 0x62, 0xa6, 0xbb, 0xf7, 0xfb, 0x8b, 0xe5, 0x34, 0xdd, 0x3d, 0xf5, 0x54, 0x3d, 0xf5, 0x54, + 0x55, 0x37, 0xdc, 0x63, 0xb4, 0x22, 0x3c, 0xce, 0x2c, 0x97, 0x09, 0xea, 0xe5, 0x8b, 0xc4, 0x65, + 0xc7, 0x15, 0xea, 0xb9, 0xd4, 0xb7, 0xc2, 0x6f, 0x60, 0x96, 0x3d, 0x2e, 0x38, 0x9e, 0xd6, 0x66, + 0x66, 0x9b, 0x59, 0x72, 0x39, 0xcf, 0xfd, 0x12, 0xf7, 0xad, 0x1c, 0xf1, 0xa9, 0xc2, 0x58, 0x27, + 0xab, 0x39, 0x2a, 0xc8, 0xaa, 0x55, 0x26, 0x8e, 0xcb, 0x88, 0x70, 0x39, 0x53, 0x6e, 0x92, 0x93, + 0x0e, 0x77, 0xb8, 0x5c, 0x5a, 0xe1, 0x4a, 0x9f, 0xce, 0x38, 0x9c, 0x3b, 0x47, 0xd4, 0x22, 0x65, + 0xd7, 0x22, 0x8c, 0x71, 0x21, 0x21, 0xbe, 0xfe, 0xbb, 0xd8, 0x9d, 0xa1, 0x43, 0x19, 0xf5, 0xdd, + 0xaa, 0xe1, 0x42, 0x77, 0xc3, 0x32, 0xf1, 0x48, 0xa9, 0x6a, 0x67, 0x74, 0xb7, 0x13, 0xa7, 0xca, + 0xc6, 0x98, 0x04, 0x7c, 0x10, 0xa6, 0xb2, 0x2f, 0x81, 0x36, 0x3d, 0xae, 0x50, 0x5f, 0x18, 0xaf, + 0xe0, 0x46, 0xd3, 0xa9, 0x5f, 0xe6, 0xcc, 0xa7, 0xf8, 0x09, 0xc4, 0x55, 0x80, 0x29, 0x34, 0x8b, + 0xd2, 0x89, 0xb5, 0x39, 0xb3, 0xab, 0x5a, 0xa6, 0x82, 0xee, 0xc6, 0xce, 0x7e, 0xdd, 0x8d, 0xd8, + 0x1a, 0x66, 0x7c, 0x42, 0x70, 0x47, 0x3a, 0xb6, 0xa9, 0xe3, 0xfa, 0x82, 0x7a, 0xb4, 0x70, 0xa0, + 0xec, 0x75, 0x64, 0x7c, 0x0b, 0xe2, 0xfc, 0x0d, 0xa3, 0x5e, 0x18, 0x62, 0x28, 0x3d, 0x62, 0xeb, + 0x1d, 0x9e, 0x87, 0xff, 0xf2, 0x9c, 0x31, 0x9a, 0x0f, 0x15, 0xcb, 0xba, 0x85, 0xa9, 0xe8, 0x2c, + 0x4a, 0x8f, 0xd8, 0xa3, 0xf5, 0xc3, 0xbd, 0x02, 0x7e, 0x0a, 0x50, 0xaf, 0xc4, 0xd4, 0x90, 0xe4, + 0xb8, 0x60, 0xaa, 0xb2, 0x99, 0x61, 0xd9, 0x4c, 0x55, 0x6a, 0x5d, 0x36, 0x73, 0x9f, 0x38, 0x54, + 0x07, 0xb6, 0x1b, 0x90, 0xc6, 0x77, 0x04, 0xa9, 0x6e, 0x34, 0xb5, 0x14, 0x59, 0xc0, 0x5e, 0xed, + 0x67, 0x56, 0x27, 0x2d, 0x39, 0x27, 0xd6, 0x96, 0x7b, 0xc8, 0xd2, 0xec, 0x31, 0xd0, 0xfa, 0x4c, + 0x78, 0xad, 0x81, 0xf0, 0xb3, 0xa6, 0x5c, 0xa2, 0x32, 0x97, 0xc5, 0xbe, 0xb9, 0x28, 0x76, 0x4d, + 0xc9, 0x6c, 0xc1, 0xed, 0x0e, 0xb9, 0x04, 0x55, 0xc1, 0xa7, 0xe1, 0x5f, 0xe9, 0x28, 0xd4, 0x34, + 0xac, 0x6a, 0xcc, 0x1e, 0x96, 0xfb, 0xbd, 0x82, 0x51, 0x81, 0x99, 0xce, 0x48, 0xad, 0xc1, 0x21, + 0x8c, 0xb7, 0x68, 0x10, 0xe8, 0xc6, 0x18, 0x40, 0x01, 0x7b, 0xac, 0x39, 0xf7, 0xc0, 0xd8, 0x81, + 0xb9, 0x2e, 0x61, 0x2b, 0x47, 0xe2, 0x0a, 0xb4, 0x0b, 0x60, 0xf4, 0xc2, 0x6b, 0xf2, 0x3b, 0x10, + 0xf7, 0xe4, 0x89, 0xa6, 0xbc, 0xd0, 0x83, 0x72, 0x23, 0x5e, 0xa3, 0x8c, 0x3d, 0x48, 0xbc, 0xf4, + 0x08, 0xf3, 0x89, 0x6c, 0x3e, 0xfc, 0x3f, 0x44, 0x6b, 0x4c, 0xa2, 0x6e, 0x21, 0xec, 0xe3, 0x22, + 0x75, 0x9d, 0xa2, 0x90, 0xa5, 0x8b, 0xd9, 0x7a, 0x87, 0x31, 0xc4, 0x0a, 0x44, 0x10, 0xd9, 0x9c, + 0xa3, 0xb6, 0x5c, 0x1b, 0xdb, 0x70, 0x53, 0x46, 0x78, 0x41, 0x7c, 0x61, 0xd3, 0x12, 0x17, 0xf4, + 0xb9, 0x32, 0x6e, 0x6b, 0x7a, 0xd4, 0xde, 0xf4, 0xc6, 0xa6, 0x1e, 0xa9, 0x56, 0x74, 0x2d, 0xd3, + 0x3a, 0x15, 0xd4, 0x48, 0x65, 0xed, 0xdd, 0x30, 0xfc, 0x23, 0x91, 0xf8, 0x03, 0x82, 0xb8, 0x9a, + 0x57, 0x9c, 0xe9, 0x27, 0x43, 0xd3, 0x45, 0x91, 0x34, 0xaf, 0x6a, 0xae, 0xb8, 0x18, 0x4b, 0x6f, + 0x7f, 0xfc, 0xf9, 0x18, 0x9d, 0xc7, 0x73, 0x56, 0xbf, 0x3b, 0x0c, 0x7f, 0x43, 0x30, 0xd1, 0x36, + 0x7f, 0x78, 0xab, 0x7f, 0x99, 0x3a, 0xdf, 0x2c, 0xc9, 0x87, 0xd7, 0x40, 0x6a, 0xd6, 0x1b, 0x92, 0xb5, 0x85, 0x33, 0x3d, 0x58, 0xb7, 0xdf, 0x06, 0xf8, 0x0b, 0x82, 0xb1, 0x96, 0x26, 0xc4, 0x0f, - 0x06, 0x63, 0x51, 0x1d, 0xd3, 0xe4, 0xc6, 0xc0, 0x38, 0xcd, 0x7d, 0x5d, 0x72, 0xcf, 0xe0, 0xbb, - 0x97, 0xe7, 0x1e, 0xe0, 0xaf, 0x08, 0x12, 0x0d, 0x4d, 0x8f, 0xb7, 0x06, 0x8f, 0x5e, 0x9f, 0xd5, - 0xe4, 0xe3, 0x2b, 0xa2, 0x75, 0x06, 0x96, 0xcc, 0x60, 0x09, 0x2f, 0x5a, 0x7d, 0x9e, 0xf0, 0xac, - 0x1a, 0x4d, 0xfc, 0x19, 0xc1, 0x78, 0xdb, 0x2c, 0xad, 0xf4, 0x23, 0xd1, 0x8a, 0x48, 0x6e, 0x0e, + 0x06, 0x63, 0x51, 0x1d, 0xd3, 0xe4, 0xe6, 0xc0, 0x38, 0xcd, 0x7d, 0x5d, 0x72, 0xcf, 0xe0, 0xfb, + 0x57, 0xe7, 0x1e, 0xe0, 0xaf, 0x08, 0x12, 0x0d, 0x4d, 0x8f, 0xb7, 0x07, 0x8f, 0x5e, 0x9f, 0xd5, + 0xe4, 0xe3, 0x6b, 0xa2, 0x75, 0x06, 0x96, 0xcc, 0x60, 0x09, 0x2f, 0x5a, 0x7d, 0x9e, 0xf0, 0xac, + 0x1a, 0x4d, 0xfc, 0x19, 0xc1, 0x78, 0xdb, 0x2c, 0xad, 0xf4, 0x23, 0xd1, 0x8a, 0x48, 0x6e, 0x0d, 0x8a, 0xa8, 0x31, 0x5e, 0x91, 0x8c, 0x97, 0x71, 0xba, 0xa7, 0xe6, 0x21, 0x30, 0xab, 0x66, 0x71, - 0xe7, 0xe0, 0xf4, 0x3c, 0x85, 0xce, 0xce, 0x53, 0xe8, 0xf7, 0x79, 0x0a, 0xbd, 0xbf, 0x48, 0x45, - 0xce, 0x2e, 0x52, 0x91, 0x9f, 0x17, 0xa9, 0xc8, 0xeb, 0x47, 0x8e, 0x2b, 0x8a, 0x95, 0x9c, 0x99, - 0xe7, 0xa5, 0xaa, 0xb7, 0x0c, 0xf7, 0x9c, 0x9a, 0xe7, 0xe3, 0x7b, 0xd6, 0x49, 0xa7, 0x07, 0x3e, - 0x28, 0x53, 0x3f, 0x17, 0x97, 0x8f, 0xfc, 0xfa, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, 0x57, - 0x58, 0xcf, 0xfd, 0x08, 0x00, 0x00, + 0xf7, 0xf0, 0xec, 0x22, 0x85, 0xce, 0x2f, 0x52, 0xe8, 0xf7, 0x45, 0x0a, 0xbd, 0xbf, 0x4c, 0x45, + 0xce, 0x2f, 0x53, 0x91, 0x9f, 0x97, 0xa9, 0xc8, 0xeb, 0x47, 0x8e, 0x2b, 0x8a, 0x95, 0x9c, 0x99, + 0xe7, 0xa5, 0xaa, 0xb7, 0x0c, 0xf7, 0x9c, 0x9a, 0xe7, 0x93, 0x0d, 0xeb, 0xb4, 0xd3, 0x03, 0x1f, + 0x94, 0xa9, 0x9f, 0x8b, 0xcb, 0x47, 0x7e, 0xfd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x40, + 0xc6, 0x00, 0xfd, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/tx.pb.go b/x/interchainqueries/types/tx.pb.go index 265b691c7..5a7f0ca2f 100644 --- a/x/interchainqueries/types/tx.pb.go +++ b/x/interchainqueries/types/tx.pb.go @@ -884,80 +884,81 @@ func init() { } var fileDescriptor_d4793837a316491e = []byte{ - // 1168 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x4f, 0x1b, 0x47, - 0x14, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x40, 0x32, 0x25, 0xc5, 0x38, 0x8d, 0x43, 0xb6, 0x6a, 0x12, - 0xa1, 0x64, 0x57, 0x71, 0x29, 0x55, 0x41, 0xfd, 0x80, 0xb6, 0x51, 0x11, 0x42, 0xa5, 0x0b, 0xe4, - 0xd0, 0xcb, 0x6a, 0xbd, 0x3b, 0xac, 0x47, 0x5e, 0xcf, 0x38, 0x3b, 0xb3, 0xfe, 0x38, 0x54, 0xaa, - 0x72, 0xec, 0xa5, 0xf4, 0xbf, 0xa8, 0xd4, 0x0b, 0x52, 0x2b, 0xf5, 0x2f, 0xa8, 0x94, 0x63, 0xd4, - 0x53, 0x0f, 0x55, 0x55, 0xc1, 0x81, 0x63, 0xff, 0x85, 0x6a, 0x3e, 0xd6, 0x98, 0x18, 0x9b, 0xc0, - 0x05, 0xf6, 0xbd, 0xf7, 0x7b, 0x6f, 0x7e, 0xf3, 0xe6, 0x7d, 0x18, 0x98, 0x04, 0x25, 0x3c, 0xa6, - 0xc4, 0xc6, 0x84, 0xa3, 0xd8, 0xaf, 0x79, 0x98, 0x3c, 0x4f, 0x50, 0x8c, 0x11, 0xb3, 0x79, 0xc7, - 0x6a, 0xc6, 0x94, 0x53, 0x38, 0xaf, 0x31, 0xd6, 0x00, 0xa6, 0x74, 0xd3, 0x6b, 0x60, 0x42, 0x6d, - 0xf9, 0x57, 0xa1, 0x4b, 0x73, 0x3e, 0x65, 0x0d, 0xca, 0xec, 0x06, 0x0b, 0xed, 0xd6, 0x13, 0xf1, - 0x4f, 0x1b, 0xe6, 0x95, 0xc1, 0x95, 0x92, 0xad, 0x04, 0x6d, 0x9a, 0x0d, 0x69, 0x48, 0x95, 0x5e, - 0x7c, 0xa5, 0x0e, 0x21, 0xa5, 0x61, 0x84, 0x6c, 0x29, 0x55, 0x93, 0x7d, 0xdb, 0x23, 0x5d, 0x6d, - 0x7a, 0x30, 0x9c, 0x76, 0x88, 0x08, 0x62, 0x38, 0x8d, 0x7c, 0x7f, 0x38, 0xb0, 0xe9, 0xc5, 0x5e, - 0x23, 0xc5, 0xdd, 0xe6, 0x88, 0x04, 0x28, 0x6e, 0x60, 0xc2, 0x6d, 0xaf, 0xea, 0x63, 0x9b, 0x77, - 0x9b, 0x28, 0x35, 0xde, 0xe9, 0x33, 0xfa, 0x71, 0xb7, 0xc9, 0xa9, 0xe0, 0x44, 0xf7, 0x95, 0xd9, - 0xfc, 0x29, 0x03, 0x4a, 0x5b, 0x2c, 0x74, 0x50, 0x88, 0x19, 0x47, 0xf1, 0x46, 0xef, 0xa4, 0x6f, - 0x12, 0x14, 0x77, 0xe1, 0x1d, 0x00, 0xc4, 0x91, 0x5d, 0x57, 0x84, 0x2c, 0x1a, 0x0b, 0xc6, 0xc3, - 0xbc, 0x93, 0x97, 0x9a, 0xdd, 0x6e, 0x13, 0xc1, 0x25, 0x90, 0xad, 0xa3, 0x2e, 0x2b, 0x66, 0x16, - 0xc6, 0x1f, 0x4e, 0x55, 0x16, 0xac, 0xa1, 0xc9, 0xb6, 0x36, 0x9f, 0x6d, 0xa2, 0xae, 0x23, 0xd1, - 0xd0, 0x06, 0x6f, 0xf1, 0xd8, 0x23, 0xcc, 0xf3, 0x39, 0xa6, 0x84, 0xb9, 0xfb, 0x38, 0xe2, 0x28, - 0x2e, 0x8e, 0xcb, 0xe8, 0xb0, 0xdf, 0xf4, 0x54, 0x5a, 0xe0, 0xbb, 0xe0, 0xba, 0x4f, 0x09, 0x41, - 0x52, 0xe9, 0xe2, 0xa0, 0x98, 0x95, 0xd0, 0xc2, 0xa9, 0x72, 0x23, 0x10, 0xa0, 0xa4, 0x19, 0x78, - 0x1c, 0xb9, 0x4d, 0x14, 0x63, 0x1a, 0x14, 0x73, 0x0b, 0xc6, 0xc3, 0xac, 0x53, 0x50, 0xca, 0x6d, - 0xa9, 0x83, 0x6f, 0x83, 0x09, 0x26, 0xf3, 0x51, 0x9c, 0x90, 0x21, 0xb4, 0xb4, 0x32, 0xf5, 0xe2, - 0xe4, 0x70, 0x51, 0x0b, 0xe6, 0x12, 0x30, 0x87, 0xa7, 0xc4, 0x41, 0xac, 0x49, 0x09, 0x43, 0x70, - 0x1a, 0x64, 0x70, 0x20, 0x53, 0x92, 0x75, 0x32, 0x38, 0x30, 0x7f, 0x37, 0xc0, 0xec, 0x16, 0x0b, - 0x77, 0x92, 0x6a, 0x03, 0xf3, 0x14, 0x9a, 0x44, 0x1c, 0xce, 0x83, 0x49, 0x95, 0xc3, 0x1e, 0xfc, - 0x9a, 0x94, 0x37, 0xfa, 0xe9, 0x64, 0xfa, 0xe9, 0xc0, 0xbb, 0x20, 0xef, 0x47, 0x18, 0x11, 0x2e, - 0x7c, 0x64, 0x5e, 0xd6, 0x33, 0x45, 0xc3, 0x99, 0x54, 0xca, 0x8d, 0x00, 0x7e, 0x02, 0x26, 0x62, - 0x19, 0x5d, 0xa6, 0x62, 0xaa, 0x72, 0x7f, 0x44, 0xea, 0xfb, 0xb8, 0x38, 0xda, 0xeb, 0xec, 0x7d, - 0xff, 0x33, 0xc0, 0x54, 0x3f, 0xe1, 0xa7, 0x00, 0xd4, 0x5b, 0xae, 0x42, 0xb2, 0xa2, 0x21, 0xdf, - 0xf6, 0xc1, 0x88, 0x03, 0x76, 0x38, 0x8d, 0xbd, 0x10, 0x3d, 0xf3, 0xa2, 0x04, 0x39, 0xf9, 0x7a, - 0x4b, 0x85, 0x61, 0x70, 0x19, 0xe4, 0xaa, 0x11, 0xf5, 0xeb, 0xf2, 0x72, 0xa3, 0xcb, 0x63, 0x5d, - 0xe0, 0x1c, 0x05, 0x17, 0x59, 0xa9, 0x21, 0x1c, 0xd6, 0xb8, 0xbc, 0x7a, 0xd6, 0xd1, 0x12, 0x2c, - 0x81, 0xc9, 0x18, 0xb5, 0x30, 0xc3, 0x94, 0xc8, 0x6b, 0x67, 0x9d, 0x9e, 0x0c, 0x1f, 0x01, 0xe8, - 0x45, 0x11, 0x6d, 0xbb, 0xf5, 0x96, 0xeb, 0x7b, 0x51, 0x54, 0xf5, 0xfc, 0x3a, 0x93, 0x25, 0x30, - 0xe9, 0xdc, 0x90, 0x96, 0xcd, 0xd6, 0xe7, 0xa9, 0xde, 0x3c, 0x30, 0x40, 0xa1, 0x9f, 0x35, 0x7c, - 0x0f, 0x4c, 0x33, 0x25, 0xbb, 0xcd, 0x18, 0xed, 0xe3, 0x8e, 0xae, 0xf5, 0xeb, 0x5a, 0xbb, 0x2d, - 0x95, 0xf0, 0x06, 0x18, 0xaf, 0xa3, 0xae, 0xbc, 0x4f, 0xc1, 0x11, 0x9f, 0x70, 0x16, 0xe4, 0x5a, - 0x22, 0x82, 0xa4, 0x5a, 0x70, 0x94, 0x00, 0x9f, 0x80, 0xdc, 0xb6, 0x68, 0x32, 0xfd, 0x3a, 0xb7, - 0xad, 0xd3, 0x26, 0xb4, 0x54, 0x13, 0x5a, 0xd2, 0xfe, 0x75, 0x93, 0x39, 0x0a, 0x69, 0xfe, 0x62, - 0x80, 0x9c, 0xcc, 0x02, 0xfc, 0x0c, 0xdc, 0x24, 0xa8, 0xc3, 0x5d, 0x99, 0x0c, 0xb7, 0x86, 0x3c, - 0x51, 0x1f, 0x86, 0x0c, 0x34, 0x6b, 0xa9, 0xb1, 0x62, 0xa5, 0x63, 0xc5, 0x5a, 0x23, 0x5d, 0x67, - 0x46, 0xc0, 0xa5, 0xef, 0x57, 0x12, 0x0c, 0x1f, 0x89, 0x04, 0x7a, 0x69, 0x59, 0x0d, 0x73, 0xd3, - 0x18, 0x58, 0x01, 0x19, 0xde, 0x91, 0xfc, 0xa7, 0x2a, 0xe6, 0x88, 0x37, 0xda, 0xed, 0xa8, 0x17, - 0xce, 0xf0, 0x8e, 0xf9, 0xb7, 0x01, 0xae, 0x69, 0x19, 0x7e, 0x24, 0x9e, 0x45, 0x35, 0x85, 0xa6, - 0x79, 0xa7, 0xff, 0xbe, 0x62, 0x22, 0x59, 0x5f, 0x76, 0x90, 0xbf, 0xdb, 0xd1, 0x45, 0xd8, 0x83, - 0xc3, 0x4f, 0xc1, 0x74, 0x80, 0x22, 0xdc, 0x12, 0xdd, 0x21, 0xa7, 0x92, 0x26, 0x5c, 0x1c, 0x96, - 0x30, 0xe7, 0x7a, 0x8a, 0x97, 0x22, 0x5c, 0x03, 0x33, 0x98, 0xf8, 0x51, 0x22, 0x6a, 0x40, 0x47, - 0x18, 0xbf, 0x20, 0xc2, 0x74, 0xcf, 0x41, 0x85, 0x80, 0x20, 0x1b, 0x78, 0xdc, 0x93, 0x4f, 0x55, - 0x70, 0xe4, 0xb7, 0x59, 0x06, 0xef, 0x9c, 0xd7, 0xca, 0x69, 0xef, 0x9b, 0x1e, 0xb8, 0x2b, 0x27, - 0x44, 0x83, 0xb6, 0xd0, 0xc0, 0x7c, 0x78, 0x9e, 0x20, 0x76, 0x95, 0xae, 0x3f, 0xdb, 0x94, 0x26, - 0x58, 0x18, 0x7e, 0x84, 0xa6, 0xf1, 0x22, 0x23, 0x79, 0xec, 0xc9, 0x09, 0x77, 0x79, 0x1e, 0xab, - 0x60, 0x92, 0xa0, 0xb6, 0x7b, 0xa9, 0x09, 0x7e, 0x8d, 0xa0, 0xf6, 0xa6, 0x18, 0xe2, 0x8b, 0xa2, - 0x4a, 0xdb, 0xee, 0xd9, 0x91, 0xab, 0xfa, 0x75, 0x86, 0xa0, 0xf6, 0x5e, 0xff, 0xd4, 0x5d, 0x06, - 0x73, 0x02, 0x7b, 0xde, 0xd0, 0x57, 0x93, 0xfc, 0x16, 0x41, 0xed, 0xdd, 0xc1, 0xb9, 0x7f, 0x9a, - 0xa8, 0xdc, 0x45, 0x89, 0x1a, 0x92, 0x03, 0x9d, 0xa8, 0x3f, 0x0c, 0x30, 0xd3, 0x03, 0x6d, 0xcb, - 0xdd, 0x09, 0x97, 0x41, 0xde, 0x4b, 0x78, 0x8d, 0xc6, 0x98, 0x77, 0x55, 0xb7, 0xaf, 0x17, 0xff, - 0xfc, 0xed, 0xf1, 0xac, 0x5e, 0xee, 0x6b, 0x41, 0x10, 0x23, 0xc6, 0x76, 0x78, 0x8c, 0x49, 0xe8, - 0x9c, 0x42, 0xe1, 0x17, 0x60, 0x42, 0x6d, 0x5f, 0x5d, 0xab, 0xf7, 0x46, 0xe4, 0x4c, 0x1d, 0xb5, - 0x9e, 0x7f, 0xf9, 0xcf, 0xdd, 0xb1, 0x9f, 0x4f, 0x0e, 0x17, 0x0d, 0x47, 0xfb, 0xae, 0x2c, 0x89, - 0x2b, 0x9c, 0x46, 0xfd, 0xe1, 0xe4, 0x70, 0xf1, 0xde, 0xe0, 0x9a, 0x7f, 0x8d, 0xb3, 0x39, 0x0f, - 0xe6, 0x5e, 0x53, 0xa5, 0x57, 0xac, 0xfc, 0x9a, 0x03, 0xe3, 0x5b, 0x2c, 0x84, 0x3f, 0x1a, 0x60, - 0x6e, 0xd8, 0x36, 0xff, 0x60, 0x04, 0xd5, 0xe1, 0x1b, 0xaf, 0xf4, 0xf1, 0x95, 0xdc, 0x7a, 0x8b, - 0xf2, 0x3b, 0x70, 0x73, 0x70, 0x29, 0xda, 0xa3, 0x63, 0x0e, 0x38, 0x94, 0x3e, 0xbc, 0xa4, 0x43, - 0xef, 0xf8, 0x03, 0x03, 0xdc, 0x3a, 0xb7, 0x8d, 0xe0, 0xca, 0x45, 0xf7, 0x1a, 0xde, 0xde, 0xa5, - 0xd5, 0x2b, 0xf9, 0xf6, 0x51, 0x3a, 0xb7, 0x60, 0x2f, 0xa2, 0x34, 0xaa, 0xd3, 0x2f, 0xa2, 0x34, - 0xb2, 0x43, 0x20, 0x01, 0x85, 0x33, 0xdd, 0xb1, 0xf8, 0x26, 0xc1, 0x14, 0xb6, 0x54, 0x79, 0x73, - 0x6c, 0x7a, 0x5e, 0x29, 0xf7, 0xbd, 0x68, 0x87, 0xf5, 0xbd, 0x97, 0x47, 0x65, 0xe3, 0xd5, 0x51, - 0xd9, 0xf8, 0xf7, 0xa8, 0x6c, 0x1c, 0x1c, 0x97, 0xc7, 0x5e, 0x1d, 0x97, 0xc7, 0xfe, 0x3a, 0x2e, - 0x8f, 0x7d, 0xbb, 0x1a, 0x62, 0x5e, 0x4b, 0xaa, 0x96, 0x4f, 0x1b, 0xb6, 0x0e, 0xff, 0x98, 0xc6, - 0x61, 0xfa, 0x6d, 0xb7, 0x96, 0xec, 0xce, 0x79, 0x3f, 0xfc, 0xc5, 0x4f, 0xdf, 0xea, 0x84, 0x5c, - 0x74, 0xef, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x67, 0xb8, 0x7c, 0xb1, 0x22, 0x0c, 0x00, 0x00, + // 1170 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0x1b, 0xc7, + 0x17, 0x67, 0x8d, 0x4d, 0xf0, 0xe0, 0x40, 0x32, 0x5f, 0xf2, 0xc5, 0x38, 0x8d, 0x43, 0xb6, 0x6a, + 0x12, 0xa1, 0x64, 0x57, 0x71, 0x09, 0x55, 0x41, 0xfd, 0x01, 0x6d, 0xa3, 0x22, 0x84, 0x4a, 0x17, + 0xc8, 0xa1, 0x97, 0xd5, 0x7a, 0x77, 0x58, 0x8f, 0xbc, 0x9e, 0x71, 0x76, 0x66, 0xfd, 0xe3, 0x50, + 0xa9, 0xca, 0xb1, 0x97, 0xd2, 0xff, 0xa2, 0x52, 0x2f, 0x48, 0xad, 0xd4, 0xbf, 0xa0, 0x52, 0x8e, + 0x51, 0x4f, 0x3d, 0x54, 0x55, 0x05, 0x07, 0x8e, 0xfd, 0x17, 0xaa, 0xf9, 0xb1, 0xc6, 0xc4, 0xd8, + 0x04, 0x2e, 0xb0, 0xef, 0xbd, 0xcf, 0x7b, 0xf3, 0x99, 0x37, 0xef, 0x87, 0x81, 0x49, 0x50, 0xc2, + 0x63, 0x4a, 0x6c, 0x4c, 0x38, 0x8a, 0xfd, 0x9a, 0x87, 0xc9, 0x8b, 0x04, 0xc5, 0x18, 0x31, 0x9b, + 0x77, 0xac, 0x66, 0x4c, 0x39, 0x85, 0xf3, 0x1a, 0x63, 0x0d, 0x60, 0x4a, 0x37, 0xbd, 0x06, 0x26, + 0xd4, 0x96, 0x7f, 0x15, 0xba, 0x34, 0xe7, 0x53, 0xd6, 0xa0, 0xcc, 0x6e, 0xb0, 0xd0, 0x6e, 0x3d, + 0x11, 0xff, 0xb4, 0x61, 0x5e, 0x19, 0x5c, 0x29, 0xd9, 0x4a, 0xd0, 0xa6, 0xd9, 0x90, 0x86, 0x54, + 0xe9, 0xc5, 0x57, 0xea, 0x10, 0x52, 0x1a, 0x46, 0xc8, 0x96, 0x52, 0x35, 0xd9, 0xb7, 0x3d, 0xd2, + 0xd5, 0xa6, 0x07, 0xc3, 0x69, 0x87, 0x88, 0x20, 0x86, 0xd3, 0xc8, 0xf7, 0x87, 0x03, 0x9b, 0x5e, + 0xec, 0x35, 0x52, 0xdc, 0x6d, 0x8e, 0x48, 0x80, 0xe2, 0x06, 0x26, 0xdc, 0xf6, 0xaa, 0x3e, 0xb6, + 0x79, 0xb7, 0x89, 0x52, 0xe3, 0x9d, 0x3e, 0xa3, 0x1f, 0x77, 0x9b, 0x9c, 0x0a, 0x4e, 0x74, 0x5f, + 0x99, 0xcd, 0x1f, 0x33, 0xa0, 0xb4, 0xc5, 0x42, 0x07, 0x85, 0x98, 0x71, 0x14, 0x6f, 0xf4, 0x4e, + 0xfa, 0x3a, 0x41, 0x71, 0x17, 0xde, 0x01, 0x40, 0x1c, 0xd9, 0x75, 0x45, 0xc8, 0xa2, 0xb1, 0x60, + 0x3c, 0xcc, 0x3b, 0x79, 0xa9, 0xd9, 0xed, 0x36, 0x11, 0x5c, 0x02, 0xd9, 0x3a, 0xea, 0xb2, 0x62, + 0x66, 0x61, 0xfc, 0xe1, 0x54, 0x65, 0xc1, 0x1a, 0x9a, 0x6c, 0x6b, 0xf3, 0xf9, 0x26, 0xea, 0x3a, + 0x12, 0x0d, 0x6d, 0xf0, 0x3f, 0x1e, 0x7b, 0x84, 0x79, 0x3e, 0xc7, 0x94, 0x30, 0x77, 0x1f, 0x47, + 0x1c, 0xc5, 0xc5, 0x71, 0x19, 0x1d, 0xf6, 0x9b, 0x9e, 0x49, 0x0b, 0x7c, 0x17, 0x5c, 0xf7, 0x29, + 0x21, 0x48, 0x2a, 0x5d, 0x1c, 0x14, 0xb3, 0x12, 0x5a, 0x38, 0x55, 0x6e, 0x04, 0x02, 0x94, 0x34, + 0x03, 0x8f, 0x23, 0xb7, 0x89, 0x62, 0x4c, 0x83, 0x62, 0x6e, 0xc1, 0x78, 0x98, 0x75, 0x0a, 0x4a, + 0xb9, 0x2d, 0x75, 0xf0, 0xff, 0x60, 0x82, 0xc9, 0x7c, 0x14, 0x27, 0x64, 0x08, 0x2d, 0xad, 0x4c, + 0xbd, 0x3c, 0x39, 0x5c, 0xd4, 0x82, 0xb9, 0x04, 0xcc, 0xe1, 0x29, 0x71, 0x10, 0x6b, 0x52, 0xc2, + 0x10, 0x9c, 0x06, 0x19, 0x1c, 0xc8, 0x94, 0x64, 0x9d, 0x0c, 0x0e, 0xcc, 0xdf, 0x0c, 0x30, 0xbb, + 0xc5, 0xc2, 0x9d, 0xa4, 0xda, 0xc0, 0x3c, 0x85, 0x26, 0x11, 0x87, 0xf3, 0x60, 0x52, 0xe5, 0xb0, + 0x07, 0xbf, 0x26, 0xe5, 0x8d, 0x7e, 0x3a, 0x99, 0x7e, 0x3a, 0xf0, 0x2e, 0xc8, 0xfb, 0x11, 0x46, + 0x84, 0x0b, 0x1f, 0x99, 0x97, 0xf5, 0x4c, 0xd1, 0x70, 0x26, 0x95, 0x72, 0x23, 0x80, 0x1f, 0x83, + 0x89, 0x58, 0x46, 0x97, 0xa9, 0x98, 0xaa, 0xdc, 0x1f, 0x91, 0xfa, 0x3e, 0x2e, 0x8e, 0xf6, 0x3a, + 0x7b, 0xdf, 0x7f, 0x0d, 0x30, 0xd5, 0x4f, 0xf8, 0x19, 0x00, 0xf5, 0x96, 0xab, 0x90, 0xac, 0x68, + 0xc8, 0xb7, 0x7d, 0x30, 0xe2, 0x80, 0x1d, 0x4e, 0x63, 0x2f, 0x44, 0xcf, 0xbd, 0x28, 0x41, 0x4e, + 0xbe, 0xde, 0x52, 0x61, 0x18, 0x5c, 0x06, 0xb9, 0x6a, 0x44, 0xfd, 0xba, 0xbc, 0xdc, 0xe8, 0xf2, + 0x58, 0x17, 0x38, 0x47, 0xc1, 0x45, 0x56, 0x6a, 0x08, 0x87, 0x35, 0x2e, 0xaf, 0x9e, 0x75, 0xb4, + 0x04, 0x4b, 0x60, 0x32, 0x46, 0x2d, 0xcc, 0x30, 0x25, 0xf2, 0xda, 0x59, 0xa7, 0x27, 0xc3, 0x47, + 0x00, 0x7a, 0x51, 0x44, 0xdb, 0x6e, 0xbd, 0xe5, 0xfa, 0x5e, 0x14, 0x55, 0x3d, 0xbf, 0xce, 0x64, + 0x09, 0x4c, 0x3a, 0x37, 0xa4, 0x65, 0xb3, 0xf5, 0x59, 0xaa, 0x37, 0x0f, 0x0c, 0x50, 0xe8, 0x67, + 0x0d, 0xdf, 0x03, 0xd3, 0x4c, 0xc9, 0x6e, 0x33, 0x46, 0xfb, 0xb8, 0xa3, 0x6b, 0xfd, 0xba, 0xd6, + 0x6e, 0x4b, 0x25, 0xbc, 0x01, 0xc6, 0xeb, 0xa8, 0x2b, 0xef, 0x53, 0x70, 0xc4, 0x27, 0x9c, 0x05, + 0xb9, 0x96, 0x88, 0x20, 0xa9, 0x16, 0x1c, 0x25, 0xc0, 0x27, 0x20, 0xb7, 0x2d, 0x9a, 0x4c, 0xbf, + 0xce, 0x6d, 0xeb, 0xb4, 0x09, 0x2d, 0xd5, 0x84, 0x96, 0xb4, 0x7f, 0xd5, 0x64, 0x8e, 0x42, 0x9a, + 0x3f, 0x1b, 0x20, 0x27, 0xb3, 0x00, 0x3f, 0x05, 0x37, 0x09, 0xea, 0x70, 0x57, 0x26, 0xc3, 0xad, + 0x21, 0x4f, 0xd4, 0x87, 0x21, 0x03, 0xcd, 0x5a, 0x6a, 0xac, 0x58, 0xe9, 0x58, 0xb1, 0xd6, 0x48, + 0xd7, 0x99, 0x11, 0x70, 0xe9, 0xfb, 0xa5, 0x04, 0xc3, 0x47, 0x22, 0x81, 0x5e, 0x5a, 0x56, 0xc3, + 0xdc, 0x34, 0x06, 0x56, 0x40, 0x86, 0x77, 0x24, 0xff, 0xa9, 0x8a, 0x39, 0xe2, 0x8d, 0x76, 0x3b, + 0xea, 0x85, 0x33, 0xbc, 0x63, 0xfe, 0x65, 0x80, 0x6b, 0x5a, 0x86, 0x1f, 0x8a, 0x67, 0x51, 0x4d, + 0xa1, 0x69, 0xde, 0xe9, 0xbf, 0xaf, 0x98, 0x48, 0xd6, 0x17, 0x1d, 0xe4, 0xef, 0x76, 0x74, 0x11, + 0xf6, 0xe0, 0xf0, 0x13, 0x30, 0x1d, 0xa0, 0x08, 0xb7, 0x44, 0x77, 0xc8, 0xa9, 0xa4, 0x09, 0x17, + 0x87, 0x25, 0xcc, 0xb9, 0x9e, 0xe2, 0xa5, 0x08, 0xd7, 0xc0, 0x0c, 0x26, 0x7e, 0x94, 0x88, 0x1a, + 0xd0, 0x11, 0xc6, 0x2f, 0x88, 0x30, 0xdd, 0x73, 0x50, 0x21, 0x20, 0xc8, 0x06, 0x1e, 0xf7, 0xe4, + 0x53, 0x15, 0x1c, 0xf9, 0x6d, 0x96, 0xc1, 0x3b, 0xe7, 0xb5, 0x72, 0xda, 0xfb, 0xa6, 0x07, 0xee, + 0xca, 0x09, 0xd1, 0xa0, 0x2d, 0x34, 0x30, 0x1f, 0x5e, 0x24, 0x88, 0x5d, 0xa5, 0xeb, 0xcf, 0x36, + 0xa5, 0x09, 0x16, 0x86, 0x1f, 0xa1, 0x69, 0xbc, 0xcc, 0x48, 0x1e, 0x7b, 0x72, 0xc2, 0x5d, 0x9e, + 0xc7, 0x2a, 0x98, 0x24, 0xa8, 0xed, 0x5e, 0x6a, 0x82, 0x5f, 0x23, 0xa8, 0xbd, 0x29, 0x86, 0xf8, + 0xa2, 0xa8, 0xd2, 0xb6, 0x7b, 0x76, 0xe4, 0xaa, 0x7e, 0x9d, 0x21, 0xa8, 0xbd, 0xd7, 0x3f, 0x75, + 0x97, 0xc1, 0x9c, 0xc0, 0x9e, 0x37, 0xf4, 0xd5, 0x24, 0xbf, 0x45, 0x50, 0x7b, 0x77, 0x70, 0xee, + 0x9f, 0x26, 0x2a, 0x77, 0x51, 0xa2, 0x86, 0xe4, 0x40, 0x27, 0xea, 0x77, 0x03, 0xcc, 0xf4, 0x40, + 0xdb, 0x72, 0x77, 0xc2, 0x65, 0x90, 0xf7, 0x12, 0x5e, 0xa3, 0x31, 0xe6, 0x5d, 0xd5, 0xed, 0xeb, + 0xc5, 0x3f, 0x7e, 0x7d, 0x3c, 0xab, 0x97, 0xfb, 0x5a, 0x10, 0xc4, 0x88, 0xb1, 0x1d, 0x1e, 0x63, + 0x12, 0x3a, 0xa7, 0x50, 0xf8, 0x39, 0x98, 0x50, 0xdb, 0x57, 0xd7, 0xea, 0xbd, 0x11, 0x39, 0x53, + 0x47, 0xad, 0xe7, 0x5f, 0xfd, 0x7d, 0x77, 0xec, 0xa7, 0x93, 0xc3, 0x45, 0xc3, 0xd1, 0xbe, 0x2b, + 0x4b, 0xe2, 0x0a, 0xa7, 0x51, 0xbf, 0x3f, 0x39, 0x5c, 0xbc, 0x37, 0xb8, 0xe6, 0xdf, 0xe0, 0x6c, + 0xce, 0x83, 0xb9, 0x37, 0x54, 0xe9, 0x15, 0x2b, 0xbf, 0xe4, 0xc0, 0xf8, 0x16, 0x0b, 0xe1, 0x0f, + 0x06, 0x98, 0x1b, 0xb6, 0xcd, 0x9f, 0x8e, 0xa0, 0x3a, 0x7c, 0xe3, 0x95, 0x3e, 0xba, 0x92, 0x5b, + 0x6f, 0x51, 0x7e, 0x0b, 0x6e, 0x0e, 0x2e, 0x45, 0x7b, 0x74, 0xcc, 0x01, 0x87, 0xd2, 0x07, 0x97, + 0x74, 0xe8, 0x1d, 0x7f, 0x60, 0x80, 0x5b, 0xe7, 0xb6, 0x11, 0x5c, 0xb9, 0xe8, 0x5e, 0xc3, 0xdb, + 0xbb, 0xb4, 0x7a, 0x25, 0xdf, 0x3e, 0x4a, 0xe7, 0x16, 0xec, 0x45, 0x94, 0x46, 0x75, 0xfa, 0x45, + 0x94, 0x46, 0x76, 0x08, 0x24, 0xa0, 0x70, 0xa6, 0x3b, 0x16, 0xdf, 0x26, 0x98, 0xc2, 0x96, 0x2a, + 0x6f, 0x8f, 0x4d, 0xcf, 0x2b, 0xe5, 0xbe, 0x13, 0xed, 0xb0, 0xbe, 0xf7, 0xea, 0xa8, 0x6c, 0xbc, + 0x3e, 0x2a, 0x1b, 0xff, 0x1c, 0x95, 0x8d, 0x83, 0xe3, 0xf2, 0xd8, 0xeb, 0xe3, 0xf2, 0xd8, 0x9f, + 0xc7, 0xe5, 0xb1, 0x6f, 0x56, 0x43, 0xcc, 0x6b, 0x49, 0xd5, 0xf2, 0x69, 0xc3, 0xd6, 0xe1, 0x1f, + 0xd3, 0x38, 0x4c, 0xbf, 0xed, 0xd6, 0x53, 0xbb, 0x73, 0xde, 0x0f, 0x7f, 0xf1, 0xd3, 0xb7, 0x3a, + 0x21, 0x17, 0xdd, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xaf, 0xe2, 0x7e, 0x22, 0x0c, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchainqueries/types/tx_test.go b/x/interchainqueries/types/tx_test.go index 835abf9ce..0addf3d3b 100644 --- a/x/interchainqueries/types/tx_test.go +++ b/x/interchainqueries/types/tx_test.go @@ -8,7 +8,7 @@ import ( ibchost "github.com/cosmos/ibc-go/v8/modules/core/exported" "github.com/stretchr/testify/require" - iqtypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types" + iqtypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types" ) const TestAddress = "cosmos10h9stc5v6ntgeygf5xf945njqq5h32r53uquvw" diff --git a/x/interchaintxs/client/cli/query.go b/x/interchaintxs/client/cli/query.go index 7ebb89948..7cd1100d4 100644 --- a/x/interchaintxs/client/cli/query.go +++ b/x/interchaintxs/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/interchaintxs/client/cli/query_interchainaccounts.go b/x/interchaintxs/client/cli/query_interchainaccounts.go index 784a4ada2..a32a7d445 100644 --- a/x/interchaintxs/client/cli/query_interchainaccounts.go +++ b/x/interchaintxs/client/cli/query_interchainaccounts.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func CmdInterchainAccountCmd() *cobra.Command { diff --git a/x/interchaintxs/client/cli/query_params.go b/x/interchaintxs/client/cli/query_params.go index 206605fca..c6123d9aa 100644 --- a/x/interchaintxs/client/cli/query_params.go +++ b/x/interchaintxs/client/cli/query_params.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func CmdQueryParams() *cobra.Command { diff --git a/x/interchaintxs/client/cli/tx.go b/x/interchaintxs/client/cli/tx.go index 26a914656..512f9d617 100644 --- a/x/interchaintxs/client/cli/tx.go +++ b/x/interchaintxs/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/interchaintxs/genesis.go b/x/interchaintxs/genesis.go index 63cf86198..33483f6c9 100644 --- a/x/interchaintxs/genesis.go +++ b/x/interchaintxs/genesis.go @@ -3,8 +3,8 @@ package interchaintxs import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/interchaintxs/genesis_test.go b/x/interchaintxs/genesis_test.go index d50e01491..6759b0931 100644 --- a/x/interchaintxs/genesis_test.go +++ b/x/interchaintxs/genesis_test.go @@ -5,10 +5,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil/common/nullify" - keepertest "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - "github.com/neutron-org/neutron/v4/x/interchaintxs" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/testutil/common/nullify" + keepertest "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func TestGenesis(t *testing.T) { diff --git a/x/interchaintxs/ibc_module.go b/x/interchaintxs/ibc_module.go index 85183f032..77043a795 100644 --- a/x/interchaintxs/ibc_module.go +++ b/x/interchaintxs/ibc_module.go @@ -9,7 +9,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" - "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" ) var _ porttypes.IBCModule = IBCModule{} diff --git a/x/interchaintxs/keeper/grpc_query.go b/x/interchaintxs/keeper/grpc_query.go index 1e0373538..925847d29 100644 --- a/x/interchaintxs/keeper/grpc_query.go +++ b/x/interchaintxs/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/interchaintxs/keeper/grpc_query_interchainaccount.go b/x/interchaintxs/keeper/grpc_query_interchainaccount.go index d564636cc..94489e7c7 100644 --- a/x/interchaintxs/keeper/grpc_query_interchainaccount.go +++ b/x/interchaintxs/keeper/grpc_query_interchainaccount.go @@ -9,7 +9,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func (k Keeper) InterchainAccountAddress(c context.Context, req *types.QueryInterchainAccountAddressRequest) (*types.QueryInterchainAccountAddressResponse, error) { diff --git a/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go b/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go index 327e20573..4550a9afc 100644 --- a/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go +++ b/x/interchaintxs/keeper/grpc_query_interchainaccount_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/interchaintxs/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/testutil" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func TestKeeper_InterchainAccountAddress(t *testing.T) { diff --git a/x/interchaintxs/keeper/grpc_query_params.go b/x/interchaintxs/keeper/grpc_query_params.go index fb917e8f9..4119d0b92 100644 --- a/x/interchaintxs/keeper/grpc_query_params.go +++ b/x/interchaintxs/keeper/grpc_query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func (k Keeper) Params(c context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/interchaintxs/keeper/grpc_query_params_test.go b/x/interchaintxs/keeper/grpc_query_params_test.go index 89770d771..0d75ff1db 100644 --- a/x/interchaintxs/keeper/grpc_query_params_test.go +++ b/x/interchaintxs/keeper/grpc_query_params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func TestParamsQuery(t *testing.T) { diff --git a/x/interchaintxs/keeper/ibc_handlers.go b/x/interchaintxs/keeper/ibc_handlers.go index 93097350c..bdceebf64 100644 --- a/x/interchaintxs/keeper/ibc_handlers.go +++ b/x/interchaintxs/keeper/ibc_handlers.go @@ -3,7 +3,7 @@ package keeper import ( "time" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" "cosmossdk.io/errors" @@ -12,9 +12,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a sudo call. diff --git a/x/interchaintxs/keeper/ibc_handlers_test.go b/x/interchaintxs/keeper/ibc_handlers_test.go index 313e25391..df8faca3d 100644 --- a/x/interchaintxs/keeper/ibc_handlers_test.go +++ b/x/interchaintxs/keeper/ibc_handlers_test.go @@ -6,7 +6,7 @@ import ( types2 "cosmossdk.io/store/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" sdk "github.com/cosmos/cosmos-sdk/types" icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" @@ -14,11 +14,11 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/interchaintxs/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/types" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/testutil" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/types" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) const ICAId = ".ica0" diff --git a/x/interchaintxs/keeper/keeper.go b/x/interchaintxs/keeper/keeper.go index 4f609c96a..5a29a82b1 100644 --- a/x/interchaintxs/keeper/keeper.go +++ b/x/interchaintxs/keeper/keeper.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) const ( diff --git a/x/interchaintxs/keeper/msg_server.go b/x/interchaintxs/keeper/msg_server.go index 53f47483d..9cf0af3f3 100644 --- a/x/interchaintxs/keeper/msg_server.go +++ b/x/interchaintxs/keeper/msg_server.go @@ -16,8 +16,8 @@ import ( icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - ictxtypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + ictxtypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) type msgServer struct { diff --git a/x/interchaintxs/keeper/msg_server_test.go b/x/interchaintxs/keeper/msg_server_test.go index a04afe5bb..61feca1a0 100644 --- a/x/interchaintxs/keeper/msg_server_test.go +++ b/x/interchaintxs/keeper/msg_server_test.go @@ -9,14 +9,14 @@ import ( "cosmossdk.io/math" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -25,10 +25,10 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/neutron-org/neutron/v4/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/interchaintxs/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/testutil" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) const TestFeeCollectorAddr = "neutron1dua3d89szsmd3vwg0y5a2689ah0g4x68ps8vew" diff --git a/x/interchaintxs/keeper/params.go b/x/interchaintxs/keeper/params.go index dbbb8f6d6..abef57d10 100644 --- a/x/interchaintxs/keeper/params.go +++ b/x/interchaintxs/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // GetParams get all parameters as types.Params diff --git a/x/interchaintxs/keeper/params_test.go b/x/interchaintxs/keeper/params_test.go index 06ac97d6c..7ddf78c0d 100644 --- a/x/interchaintxs/keeper/params_test.go +++ b/x/interchaintxs/keeper/params_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - testkeeper "github.com/neutron-org/neutron/v4/testutil/interchaintxs/keeper" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func TestGetParams(t *testing.T) { diff --git a/x/interchaintxs/module.go b/x/interchaintxs/module.go index 847b16cf1..07529147c 100644 --- a/x/interchaintxs/module.go +++ b/x/interchaintxs/module.go @@ -17,9 +17,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/neutron-org/neutron/v4/x/interchaintxs/client/cli" - "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/client/cli" + "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) var ( diff --git a/x/interchaintxs/module_simulation.go b/x/interchaintxs/module_simulation.go index 945b32c88..92cc103c8 100644 --- a/x/interchaintxs/module_simulation.go +++ b/x/interchaintxs/module_simulation.go @@ -7,8 +7,8 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - interchaintxssimulation "github.com/neutron-org/neutron/v4/x/interchaintxs/simulation" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + interchaintxssimulation "github.com/neutron-org/neutron/v5/x/interchaintxs/simulation" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // avoid unused import issue diff --git a/x/interchaintxs/types/expected_keepers.go b/x/interchaintxs/types/expected_keepers.go index 6df8596aa..718b5c992 100644 --- a/x/interchaintxs/types/expected_keepers.go +++ b/x/interchaintxs/types/expected_keepers.go @@ -9,7 +9,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) // AccountKeeper defines the expected account keeper used for simulations (noalias) diff --git a/x/interchaintxs/types/genesis.pb.go b/x/interchaintxs/types/genesis.pb.go index 25770ae3c..56141516e 100644 --- a/x/interchaintxs/types/genesis.pb.go +++ b/x/interchaintxs/types/genesis.pb.go @@ -89,8 +89,8 @@ var fileDescriptor_d16558b72a810826 = []byte{ 0x0a, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xf3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x99, 0xba, 0xf9, 0x45, 0xe9, 0x30, 0xb6, - 0x7e, 0x99, 0x89, 0x7e, 0x05, 0x9a, 0x63, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x2e, - 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x02, 0x5d, 0x4b, 0x80, 0x2a, 0x01, 0x00, 0x00, + 0x7e, 0x99, 0xa9, 0x7e, 0x05, 0x9a, 0x63, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x2e, + 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd3, 0xb5, 0xac, 0x8e, 0x2a, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/interchaintxs/types/genesis_test.go b/x/interchaintxs/types/genesis_test.go index 7bab45336..ae0e0bd7b 100644 --- a/x/interchaintxs/types/genesis_test.go +++ b/x/interchaintxs/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/interchaintxs/types/params.go b/x/interchaintxs/types/params.go index 35fea139d..445a0b0d0 100644 --- a/x/interchaintxs/types/params.go +++ b/x/interchaintxs/types/params.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/neutron-org/neutron/v4/app/params" + "github.com/neutron-org/neutron/v5/app/params" "gopkg.in/yaml.v2" ) diff --git a/x/interchaintxs/types/params.pb.go b/x/interchaintxs/types/params.pb.go index e2f86cfc9..e3d2cd984 100644 --- a/x/interchaintxs/types/params.pb.go +++ b/x/interchaintxs/types/params.pb.go @@ -90,7 +90,7 @@ var fileDescriptor_52b0ced89d3fa9c6 = []byte{ // 291 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x31, 0x4b, 0x03, 0x41, 0x10, 0x85, 0x6f, 0x35, 0xa4, 0xb8, 0x58, 0x05, 0x91, 0x98, 0x62, 0x13, 0x04, 0x21, 0x8d, 0xbb, - 0x9c, 0x0a, 0x42, 0xca, 0x08, 0x76, 0x01, 0x8d, 0x56, 0x36, 0xc7, 0xde, 0x31, 0x6e, 0xb6, 0xd8, + 0x9c, 0x22, 0x42, 0xca, 0x08, 0x76, 0x01, 0x8d, 0x56, 0x36, 0xc7, 0xde, 0x31, 0x6e, 0xb6, 0xd8, 0xdd, 0xb0, 0xb3, 0x39, 0xd6, 0x3f, 0x21, 0x96, 0x96, 0xfe, 0x9c, 0x94, 0x29, 0xad, 0x44, 0xee, 0xfe, 0x88, 0xe4, 0xee, 0x52, 0x68, 0xf7, 0x98, 0x79, 0x8f, 0xf9, 0xe6, 0xc5, 0xe7, 0x06, 0xd6, 0xde, 0x59, 0xc3, 0x95, 0xf1, 0xe0, 0xf2, 0xa5, 0x50, 0xc6, 0x07, 0xe4, 0x45, 0xc2, 0x57, 0xc2, @@ -105,7 +105,7 @@ var fileDescriptor_52b0ced89d3fa9c6 = []byte{ 0xe3, 0x73, 0x14, 0xcd, 0x1e, 0x36, 0x25, 0x25, 0xdb, 0x92, 0x92, 0x9f, 0x92, 0x92, 0xf7, 0x8a, 0x46, 0xdb, 0x8a, 0x46, 0x5f, 0x15, 0x8d, 0x9e, 0x6f, 0xa4, 0xf2, 0xcb, 0x75, 0xc6, 0x72, 0xab, 0x79, 0xdb, 0xc2, 0x85, 0x75, 0x72, 0xaf, 0x79, 0x71, 0xcd, 0xc3, 0xbf, 0xf6, 0xfc, 0xeb, 0x0a, - 0x30, 0xeb, 0xd6, 0xaf, 0x5e, 0xfd, 0x06, 0x00, 0x00, 0xff, 0xff, 0x40, 0x55, 0x79, 0xd9, 0x63, + 0x30, 0xeb, 0xd6, 0xaf, 0x5e, 0xfd, 0x06, 0x00, 0x00, 0xff, 0xff, 0x91, 0xbd, 0x9e, 0xd7, 0x63, 0x01, 0x00, 0x00, } diff --git a/x/interchaintxs/types/query.pb.go b/x/interchaintxs/types/query.pb.go index 5f71e842b..5e35adaa5 100644 --- a/x/interchaintxs/types/query.pb.go +++ b/x/interchaintxs/types/query.pb.go @@ -219,7 +219,7 @@ var fileDescriptor_6130c5f6c54e2428 = []byte{ // 483 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xcf, 0x6a, 0x13, 0x41, 0x18, 0xdf, 0x4d, 0x35, 0xe8, 0xa8, 0x97, 0x69, 0x85, 0x65, 0xd1, 0x4d, 0x59, 0x1b, 0x10, 0xb1, - 0x3b, 0x24, 0x0a, 0x82, 0x48, 0xa5, 0xbd, 0xe5, 0x66, 0x03, 0x5e, 0xbc, 0x84, 0xc9, 0xee, 0xb0, + 0x3b, 0x24, 0x22, 0x82, 0x48, 0xa5, 0xbd, 0xe5, 0x66, 0x03, 0x5e, 0xbc, 0x84, 0xc9, 0xee, 0xb0, 0x1d, 0x34, 0xf3, 0x6d, 0x76, 0x66, 0x63, 0x4b, 0xc8, 0xc5, 0x93, 0x07, 0x11, 0xc1, 0x17, 0xe8, 0xcd, 0x9b, 0xcf, 0xd1, 0x63, 0xc1, 0x8b, 0x27, 0x91, 0xc4, 0x83, 0x8f, 0x21, 0x3b, 0x33, 0x6d, 0xd9, 0x9a, 0x25, 0xe2, 0x6d, 0xf8, 0xf6, 0xf7, 0xef, 0xfb, 0xb3, 0x68, 0x4b, 0xb0, 0x42, 0xe5, @@ -246,7 +246,7 @@ var fileDescriptor_6130c5f6c54e2428 = []byte{ 0x9f, 0xcc, 0x03, 0xf7, 0x74, 0x1e, 0xb8, 0x3f, 0xe7, 0x81, 0xfb, 0x69, 0x11, 0x38, 0xa7, 0x8b, 0xc0, 0xf9, 0xbe, 0x08, 0x9c, 0x57, 0x4f, 0x52, 0xae, 0x0e, 0x8a, 0x61, 0x14, 0xc3, 0xe8, 0x2c, 0xce, 0x36, 0xe4, 0xe9, 0x79, 0xb4, 0xc9, 0x63, 0x72, 0x78, 0x29, 0x9f, 0x3a, 0xca, 0x98, 0x1c, - 0x36, 0xf5, 0x8f, 0xf8, 0xe8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x16, 0x40, 0xec, 0x47, 0x51, + 0x36, 0xf5, 0x8f, 0xf8, 0xe8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xa8, 0x0b, 0x49, 0x51, 0x04, 0x00, 0x00, } diff --git a/x/interchaintxs/types/tx.pb.go b/x/interchaintxs/types/tx.pb.go index 8db65cb59..65c1ee010 100644 --- a/x/interchaintxs/types/tx.pb.go +++ b/x/interchaintxs/types/tx.pb.go @@ -16,7 +16,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" types1 "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - types3 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + types3 "github.com/neutron-org/neutron/v5/x/feerefunder/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -337,7 +337,7 @@ var fileDescriptor_50f087790e59c806 = []byte{ // 891 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x31, 0x6f, 0x23, 0x45, 0x14, 0xf6, 0xc6, 0xbe, 0xe4, 0x3c, 0x0e, 0x20, 0xf6, 0x72, 0xca, 0xda, 0x4a, 0x6c, 0x67, 0xe1, - 0x24, 0x13, 0x29, 0xb3, 0xb1, 0x41, 0x41, 0x8a, 0x04, 0x52, 0x7c, 0xd2, 0x49, 0x2e, 0x22, 0x8e, + 0x24, 0x13, 0x29, 0xb3, 0xb1, 0x11, 0x41, 0x8a, 0x04, 0x52, 0x7c, 0xd2, 0x49, 0x2e, 0x22, 0x8e, 0xbd, 0xa3, 0xa1, 0xb1, 0x66, 0x77, 0xc7, 0xeb, 0x11, 0xd9, 0x19, 0x33, 0x33, 0x6b, 0xc5, 0x1d, 0xa2, 0x42, 0x54, 0x34, 0x14, 0x74, 0x57, 0x22, 0x0a, 0x94, 0x82, 0x1f, 0x40, 0x79, 0xe5, 0x89, 0x8a, 0x2a, 0xa0, 0xa4, 0x08, 0xf5, 0x15, 0xd4, 0x68, 0x76, 0x67, 0x1c, 0xdb, 0x3a, 0x5b, 0x11, @@ -390,7 +390,7 @@ var fileDescriptor_50f087790e59c806 = []byte{ 0xaa, 0x6e, 0xfd, 0x7d, 0x55, 0xb7, 0x7e, 0xb8, 0xae, 0x17, 0x5e, 0x5d, 0xd7, 0x0b, 0x7f, 0x5e, 0xd7, 0x0b, 0x5f, 0x7e, 0x3c, 0xb3, 0xe3, 0xb4, 0xf7, 0x03, 0xc6, 0x63, 0x73, 0xf6, 0xc6, 0x1f, 0x79, 0xe7, 0x0b, 0x1f, 0x8e, 0x6c, 0xf1, 0x05, 0xeb, 0xd9, 0x28, 0x7e, 0xf8, 0x5f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xda, 0x2c, 0x63, 0xb9, 0xaa, 0x07, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x0b, 0xc4, 0x84, 0xb7, 0xaa, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/interchaintxs/types/tx_test.go b/x/interchaintxs/types/tx_test.go index 79bbc2905..f0fe46dd0 100644 --- a/x/interchaintxs/types/tx_test.go +++ b/x/interchaintxs/types/tx_test.go @@ -7,7 +7,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) const TestAddress = "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2" diff --git a/x/interchaintxs/types/types_test.go b/x/interchaintxs/types/types_test.go index db7876c3b..d49fb1f5f 100644 --- a/x/interchaintxs/types/types_test.go +++ b/x/interchaintxs/types/types_test.go @@ -3,11 +3,11 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) const ( diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 5b62e060a..d423ba3ea 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 90117ccc5..96a3c2747 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -14,7 +14,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index b57cc3b6d..237c5032a 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) // GetAuthorityMetadata returns the authority metadata for a specific denom diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index a44606575..708ec1156 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index 5e7b650f9..ed2f7d565 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error { diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go index 40e81ba8b..ff8c5b41e 100644 --- a/x/tokenfactory/keeper/before_send.go +++ b/x/tokenfactory/keeper/before_send.go @@ -7,7 +7,7 @@ import ( types2 "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" errorsmod "cosmossdk.io/errors" wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types" diff --git a/x/tokenfactory/keeper/before_send_test.go b/x/tokenfactory/keeper/before_send_test.go index cd1def71d..3ffd7a0f4 100644 --- a/x/tokenfactory/keeper/before_send_test.go +++ b/x/tokenfactory/keeper/before_send_test.go @@ -8,7 +8,7 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) initBalanceTrackContract(denom string) (sdk.AccAddress, uint64, string) { diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 35979f9f4..18bb3c617 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 38fcd1360..91e786bb9 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index f013f6ac0..e203f9c5f 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) // InitGenesis initializes the tokenfactory module's state from a provided genesis diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index e059b848f..d96e70b09 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -3,7 +3,7 @@ package keeper_test import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestGenesis() { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index b3999f363..dbba4a595 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 593e977a7..241183ca1 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) type ( diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index ac371decf..bbf4b0488 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -12,10 +12,10 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" - "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" + "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) const ( diff --git a/x/tokenfactory/keeper/migrations.go b/x/tokenfactory/keeper/migrations.go index fa10d45ae..40a46cece 100644 --- a/x/tokenfactory/keeper/migrations.go +++ b/x/tokenfactory/keeper/migrations.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/neutron-org/neutron/v4/x/tokenfactory/migrations/v2" + v2 "github.com/neutron-org/neutron/v5/x/tokenfactory/migrations/v2" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index d708a8488..b7ea7c436 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) type msgServer struct { diff --git a/x/tokenfactory/keeper/msg_server_test.go b/x/tokenfactory/keeper/msg_server_test.go index 30edda04c..70bd4158d 100644 --- a/x/tokenfactory/keeper/msg_server_test.go +++ b/x/tokenfactory/keeper/msg_server_test.go @@ -10,11 +10,11 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" - testkeeper "github.com/neutron-org/neutron/v4/testutil/tokenfactory/keeper" - "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" + testkeeper "github.com/neutron-org/neutron/v5/testutil/tokenfactory/keeper" + "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) const ( diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index 4faa1764d..3e033cf48 100644 --- a/x/tokenfactory/keeper/params.go +++ b/x/tokenfactory/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/tokenfactory/migrations/v2/store.go b/x/tokenfactory/migrations/v2/store.go index e36561925..5f7d2fc82 100644 --- a/x/tokenfactory/migrations/v2/store.go +++ b/x/tokenfactory/migrations/v2/store.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" - v1beta1types "github.com/neutron-org/neutron/v4/x/tokenfactory/types/v1beta1" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" + v1beta1types "github.com/neutron-org/neutron/v5/x/tokenfactory/types/v1beta1" ) type TokenFactoryKeeper interface { diff --git a/x/tokenfactory/migrations/v2/store_test.go b/x/tokenfactory/migrations/v2/store_test.go index b65b99cba..9fc3c2ae4 100644 --- a/x/tokenfactory/migrations/v2/store_test.go +++ b/x/tokenfactory/migrations/v2/store_test.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/testutil" - v2 "github.com/neutron-org/neutron/v4/x/tokenfactory/migrations/v2" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types/v1beta1" + "github.com/neutron-org/neutron/v5/testutil" + v2 "github.com/neutron-org/neutron/v5/x/tokenfactory/migrations/v2" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types/v1beta1" ) type V3DexMigrationTestSuite struct { diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index c0a2322a3..ca560c18f 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -19,9 +19,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/neutron-org/neutron/v4/x/tokenfactory/client/cli" - "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/client/cli" + "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index ad2ace108..bdc322d35 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -95,8 +95,8 @@ var fileDescriptor_99435de88ae175f7 = []byte{ 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xb3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xbc, 0xd4, 0xd2, 0x92, 0xa2, 0xfc, 0x3c, 0xdd, 0xfc, 0xa2, - 0x74, 0x18, 0x5b, 0xbf, 0xcc, 0x44, 0xbf, 0x02, 0x35, 0x1c, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, - 0xd8, 0xc0, 0x0e, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xab, 0xda, 0x91, 0xd6, 0x2c, 0x01, + 0x74, 0x18, 0x5b, 0xbf, 0xcc, 0x54, 0xbf, 0x02, 0x35, 0x1c, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, + 0xd8, 0xc0, 0x0e, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x39, 0xf1, 0xea, 0x2c, 0x01, 0x00, 0x00, } diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index 14c54eb55..102b751f4 100644 --- a/x/tokenfactory/types/denoms_test.go +++ b/x/tokenfactory/types/denoms_test.go @@ -3,11 +3,11 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func TestDecomposeDenoms(t *testing.T) { diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index 3415f1e6c..dd6d89194 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -153,30 +153,30 @@ var fileDescriptor_5749c3f71850298b = []byte{ // 411 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0xae, 0xd2, 0x40, 0x14, 0xc6, 0x3b, 0xf7, 0x5e, 0x6f, 0x62, 0x2f, 0x1a, 0xad, 0x92, 0x54, 0x82, 0x2d, 0x74, 0x61, - 0x08, 0x89, 0x6d, 0x40, 0x62, 0x0c, 0x3b, 0x2a, 0x89, 0x2b, 0x13, 0x52, 0x77, 0x6e, 0x9a, 0xa1, - 0x1d, 0x4b, 0x83, 0xed, 0x69, 0x66, 0x06, 0x62, 0x5f, 0xc0, 0xb5, 0x8f, 0xe0, 0x83, 0xf8, 0x00, - 0x2c, 0x59, 0xba, 0x22, 0x06, 0x36, 0xae, 0x79, 0x01, 0x4d, 0x67, 0xc6, 0x3f, 0x5c, 0x08, 0xbb, - 0xe9, 0x99, 0xdf, 0xf9, 0xce, 0x77, 0xbe, 0x8e, 0xde, 0x05, 0x96, 0x01, 0x4b, 0x99, 0xc7, 0x61, - 0x4e, 0xf2, 0x0f, 0x38, 0xe2, 0x40, 0x4b, 0x6f, 0xd9, 0x9b, 0x12, 0x8e, 0x7b, 0x5e, 0x42, 0x72, - 0xc2, 0x52, 0xe6, 0x16, 0x14, 0x38, 0x18, 0x4d, 0xc5, 0xba, 0xff, 0xb3, 0xae, 0x62, 0x1b, 0x8f, - 0x13, 0x48, 0x40, 0x80, 0x5e, 0x75, 0x92, 0x3d, 0x8d, 0xf6, 0x49, 0xfd, 0x02, 0x53, 0x9c, 0x29, - 0xd9, 0xc6, 0xe0, 0xac, 0x05, 0xbc, 0xe0, 0x33, 0xa0, 0x29, 0x2f, 0xdf, 0x12, 0x8e, 0x63, 0xcc, - 0xb1, 0xec, 0x72, 0xbe, 0x21, 0xbd, 0xf6, 0x46, 0xda, 0x7b, 0xc7, 0x31, 0x27, 0xc6, 0x50, 0xbf, - 0x96, 0xb2, 0x26, 0x6a, 0xa1, 0xce, 0x4d, 0xbf, 0xe9, 0x9e, 0xb4, 0x3b, 0x11, 0x8c, 0x7f, 0xb5, - 0xda, 0xd8, 0x5a, 0xa0, 0x3a, 0x8c, 0x42, 0xbf, 0xaf, 0xee, 0xc3, 0x98, 0xe4, 0x90, 0x31, 0xf3, - 0xa2, 0x75, 0xd9, 0xb9, 0xe9, 0x77, 0xdd, 0x73, 0x2b, 0xbb, 0x6a, 0xfe, 0xb8, 0x6a, 0xf1, 0x9f, - 0x56, 0x8a, 0xfb, 0x8d, 0x5d, 0x2f, 0x71, 0xf6, 0x71, 0xe8, 0x1c, 0xea, 0x39, 0xc1, 0x3d, 0x55, - 0x18, 0xcb, 0xef, 0x5f, 0xff, 0xec, 0x8b, 0x8a, 0xf1, 0x4c, 0xbf, 0x23, 0x50, 0xe1, 0xfe, 0xae, - 0xff, 0x60, 0xbf, 0xb1, 0x6b, 0x52, 0x49, 0x94, 0x9d, 0x40, 0x5e, 0x1b, 0x9f, 0x91, 0x6e, 0xfc, - 0xcd, 0x24, 0xcc, 0x54, 0x28, 0xe6, 0x85, 0xd8, 0x79, 0x70, 0xde, 0xaf, 0x98, 0x34, 0xba, 0x1d, - 0xa8, 0xdf, 0x56, 0xce, 0x9f, 0xc8, 0x79, 0xc7, 0xea, 0x4e, 0xf0, 0xf0, 0xe8, 0x37, 0x18, 0xaf, - 0xf4, 0xfa, 0x0c, 0x60, 0x1e, 0x46, 0x90, 0x73, 0x8a, 0x23, 0x1e, 0xe2, 0x38, 0xa6, 0x84, 0x31, - 0xf3, 0x52, 0x2c, 0x50, 0x05, 0x8c, 0x82, 0x47, 0x15, 0xf2, 0x5a, 0x11, 0x23, 0x09, 0x0c, 0xaf, - 0x7e, 0x7e, 0xb5, 0x91, 0x3f, 0x59, 0x6d, 0x2d, 0xb4, 0xde, 0x5a, 0xe8, 0xc7, 0xd6, 0x42, 0x5f, - 0x76, 0x96, 0xb6, 0xde, 0x59, 0xda, 0xf7, 0x9d, 0xa5, 0xbd, 0x7f, 0x99, 0xa4, 0x7c, 0xb6, 0x98, - 0xba, 0x11, 0x64, 0x5e, 0x4e, 0x16, 0x9c, 0x42, 0xfe, 0x1c, 0x68, 0xf2, 0xe7, 0xec, 0x2d, 0x07, - 0xde, 0xa7, 0xc3, 0xc7, 0xc2, 0xcb, 0x82, 0xb0, 0xe9, 0xb5, 0x78, 0x19, 0x2f, 0x7e, 0x07, 0x00, - 0x00, 0xff, 0xff, 0xee, 0xef, 0xf1, 0x3e, 0xd4, 0x02, 0x00, 0x00, + 0x08, 0x89, 0x6d, 0x40, 0x34, 0x86, 0x1d, 0x95, 0xc4, 0x95, 0x09, 0xa9, 0x3b, 0x37, 0xcd, 0xd0, + 0x8e, 0xa5, 0xc1, 0xf6, 0x34, 0x33, 0x03, 0xb1, 0x2f, 0xe0, 0xda, 0x47, 0xf0, 0x41, 0x7c, 0x00, + 0x96, 0x2c, 0x5d, 0x11, 0x03, 0x1b, 0xd7, 0xbc, 0x80, 0xa6, 0x33, 0xe3, 0x1f, 0x84, 0xb0, 0x9b, + 0x9e, 0xf9, 0x9d, 0xef, 0x7c, 0xe7, 0xeb, 0xe8, 0x5d, 0x60, 0x19, 0xb0, 0x94, 0x79, 0x1c, 0xe6, + 0x24, 0x7f, 0x8f, 0x23, 0x0e, 0xb4, 0xf4, 0x96, 0xbd, 0x29, 0xe1, 0xb8, 0xe7, 0x25, 0x24, 0x27, + 0x2c, 0x65, 0x6e, 0x41, 0x81, 0x83, 0xd1, 0x54, 0xac, 0xfb, 0x2f, 0xeb, 0x2a, 0xb6, 0xf1, 0x30, + 0x81, 0x04, 0x04, 0xe8, 0x55, 0x27, 0xd9, 0xd3, 0x68, 0x9f, 0xd4, 0x2f, 0x30, 0xc5, 0x99, 0x92, + 0x6d, 0x0c, 0xce, 0x5a, 0xc0, 0x0b, 0x3e, 0x03, 0x9a, 0xf2, 0xf2, 0x0d, 0xe1, 0x38, 0xc6, 0x1c, + 0xcb, 0x2e, 0xe7, 0x2b, 0xd2, 0x6b, 0xaf, 0xa5, 0xbd, 0xb7, 0x1c, 0x73, 0x62, 0x0c, 0xf5, 0x6b, + 0x29, 0x6b, 0xa2, 0x16, 0xea, 0xdc, 0xf4, 0x9b, 0xee, 0x49, 0xbb, 0x13, 0xc1, 0xf8, 0x57, 0xab, + 0x8d, 0xad, 0x05, 0xaa, 0xc3, 0x28, 0xf4, 0xbb, 0xea, 0x3e, 0x8c, 0x49, 0x0e, 0x19, 0x33, 0x2f, + 0x5a, 0x97, 0x9d, 0x9b, 0x7e, 0xd7, 0x3d, 0xb7, 0xb2, 0xab, 0xe6, 0x8f, 0xab, 0x16, 0xff, 0x71, + 0xa5, 0xb8, 0xdf, 0xd8, 0xf5, 0x12, 0x67, 0x1f, 0x86, 0xce, 0xa1, 0x9e, 0x13, 0xdc, 0x51, 0x85, + 0xb1, 0xfc, 0xfe, 0xf9, 0xd7, 0xbe, 0xa8, 0x18, 0x4f, 0xf4, 0x5b, 0x02, 0x15, 0xee, 0x6f, 0xfb, + 0xf7, 0xf6, 0x1b, 0xbb, 0x26, 0x95, 0x44, 0xd9, 0x09, 0xe4, 0xb5, 0xf1, 0x09, 0xe9, 0xc6, 0x9f, + 0x4c, 0xc2, 0x4c, 0x85, 0x62, 0x5e, 0x88, 0x9d, 0x07, 0xe7, 0xfd, 0x8a, 0x49, 0xa3, 0xff, 0x03, + 0xf5, 0xdb, 0xca, 0xf9, 0x23, 0x39, 0xef, 0x58, 0xdd, 0x09, 0xee, 0x1f, 0xfd, 0x06, 0xe3, 0xa5, + 0x5e, 0x9f, 0x01, 0xcc, 0xc3, 0x08, 0x72, 0x4e, 0x71, 0xc4, 0x43, 0x1c, 0xc7, 0x94, 0x30, 0x66, + 0x5e, 0x8a, 0x05, 0xaa, 0x80, 0x51, 0xf0, 0xa0, 0x42, 0x5e, 0x29, 0x62, 0x24, 0x81, 0xe1, 0xd5, + 0x8f, 0x2f, 0x36, 0xf2, 0x27, 0xab, 0xad, 0x85, 0xd6, 0x5b, 0x0b, 0x7d, 0xdf, 0x5a, 0xe8, 0xf3, + 0xce, 0xd2, 0xd6, 0x3b, 0x4b, 0xfb, 0xb6, 0xb3, 0xb4, 0x77, 0x2f, 0x92, 0x94, 0xcf, 0x16, 0x53, + 0x37, 0x82, 0xcc, 0xcb, 0xc9, 0x82, 0x53, 0xc8, 0x9f, 0x02, 0x4d, 0x7e, 0x9f, 0xbd, 0xe5, 0x73, + 0xef, 0xe3, 0xe1, 0x63, 0xe1, 0x65, 0x41, 0xd8, 0xf4, 0x5a, 0xbc, 0x8c, 0x67, 0xbf, 0x02, 0x00, + 0x00, 0xff, 0xff, 0xe6, 0x0c, 0x91, 0x02, 0xd4, 0x02, 0x00, 0x00, } func (this *GenesisDenom) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go index e3039050b..80836d095 100644 --- a/x/tokenfactory/types/genesis_test.go +++ b/x/tokenfactory/types/genesis_test.go @@ -3,11 +3,11 @@ package types_test import ( "testing" - "github.com/neutron-org/neutron/v4/app/config" + "github.com/neutron-org/neutron/v5/app/config" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/x/tokenfactory/types" + "github.com/neutron-org/neutron/v5/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index a5b112b5a..bc357640f 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -171,7 +171,7 @@ var fileDescriptor_09c297db7c49d1cf = []byte{ // 457 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0x8d, 0x49, 0x14, 0xc4, 0x02, 0xa2, 0x98, 0x22, 0x9c, 0x1c, 0xec, 0xd4, 0x15, 0x52, 0x38, - 0xd4, 0xab, 0x16, 0xc4, 0x81, 0x1b, 0x31, 0x02, 0x7a, 0x40, 0xaa, 0x7c, 0x41, 0x82, 0x83, 0xb5, + 0xd4, 0xab, 0x16, 0xc1, 0x81, 0x1b, 0x31, 0x02, 0x7a, 0x40, 0xaa, 0x7c, 0x41, 0x82, 0x83, 0xb5, 0xf1, 0x8e, 0x9d, 0x55, 0xe2, 0x9d, 0xc8, 0xbb, 0x69, 0xc9, 0x5f, 0xc0, 0x85, 0x8f, 0xe0, 0x4b, 0x72, 0xec, 0x91, 0x93, 0x41, 0xc9, 0x1f, 0xf4, 0x0b, 0x50, 0xd6, 0xae, 0x9a, 0x94, 0x9c, 0xbc, 0xf3, 0xde, 0xcc, 0x78, 0xde, 0x9b, 0x21, 0x07, 0xa8, 0x72, 0x54, 0x42, 0x51, 0x8d, 0x63, 0x90, @@ -197,7 +197,7 @@ var fileDescriptor_09c297db7c49d1cf = []byte{ 0xb5, 0xfe, 0x2e, 0x5d, 0xeb, 0xfb, 0xca, 0x6d, 0x5c, 0xae, 0xdc, 0xc6, 0xef, 0x95, 0xdb, 0xf8, 0xf2, 0x7a, 0xc3, 0x45, 0x09, 0x33, 0x5d, 0xa0, 0x3c, 0xc2, 0x22, 0xbb, 0x7e, 0xd3, 0xf3, 0x57, 0xf4, 0xdb, 0xf6, 0xc1, 0x1a, 0x67, 0x87, 0x6d, 0x73, 0x49, 0x2f, 0xff, 0x05, 0x00, 0x00, 0xff, - 0xff, 0x0e, 0x4e, 0x8c, 0xba, 0xd5, 0x02, 0x00, 0x00, + 0xff, 0x06, 0xad, 0xec, 0x86, 0xd5, 0x02, 0x00, 0x00, } func (m *WhitelistedHook) Marshal() (dAtA []byte, err error) { diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index 5e6fb2b06..ebde7e9b6 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -418,50 +418,50 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 677 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x4f, 0x13, 0x4f, - 0x18, 0xee, 0xf2, 0xfb, 0x59, 0x65, 0x14, 0x0d, 0x03, 0x1a, 0x6c, 0x70, 0x2b, 0xa3, 0x31, 0x98, - 0xe0, 0x8e, 0x20, 0xf1, 0x00, 0x12, 0xa1, 0x18, 0x63, 0x62, 0x48, 0x60, 0x25, 0x1e, 0x88, 0x49, - 0x33, 0xed, 0x0e, 0xa5, 0x81, 0xdd, 0xb7, 0xcc, 0x4c, 0x89, 0x0d, 0xe1, 0x82, 0x89, 0x67, 0x13, - 0x8f, 0x7e, 0x07, 0x3f, 0x07, 0x47, 0x12, 0x2e, 0x9e, 0x1a, 0x03, 0x7e, 0x82, 0x1e, 0xbc, 0x78, - 0x31, 0x9d, 0x99, 0xe5, 0x8f, 0x2d, 0x9b, 0x5a, 0x12, 0x6f, 0xdb, 0x79, 0x9f, 0xf7, 0x79, 0x9f, - 0xe7, 0xfd, 0x93, 0xa2, 0x51, 0x90, 0x21, 0xc8, 0xb2, 0xa4, 0x0a, 0xd6, 0x79, 0xb4, 0xca, 0x8a, - 0x0a, 0x44, 0x8d, 0x6e, 0x8d, 0x17, 0xb8, 0x62, 0xe3, 0x74, 0xb3, 0xca, 0x45, 0xcd, 0xab, 0x08, - 0x50, 0x80, 0x87, 0x2d, 0xd2, 0x3b, 0x8d, 0xf4, 0x2c, 0x32, 0x33, 0x58, 0x82, 0x12, 0x68, 0x20, - 0x6d, 0x7e, 0x99, 0x9c, 0xcc, 0x70, 0x09, 0xa0, 0xb4, 0xc1, 0x29, 0xab, 0x94, 0x29, 0x8b, 0x22, - 0x50, 0x4c, 0x95, 0x21, 0x92, 0x36, 0x3a, 0xd2, 0xb6, 0x76, 0x85, 0x09, 0x16, 0xc6, 0x90, 0xc9, - 0x44, 0x79, 0xac, 0xaa, 0xd6, 0x40, 0x94, 0x55, 0x6d, 0x81, 0x2b, 0x16, 0x30, 0xc5, 0x4c, 0x16, - 0x19, 0x44, 0x78, 0xa9, 0xa9, 0x7c, 0x51, 0x53, 0xf9, 0x7c, 0xb3, 0xca, 0xa5, 0x22, 0x4b, 0x68, - 0xe0, 0xcc, 0xab, 0xac, 0x40, 0x24, 0x39, 0x9e, 0x42, 0x69, 0x53, 0x72, 0xc8, 0xb9, 0xeb, 0x8c, - 0x5e, 0x9d, 0x18, 0xf6, 0xda, 0x1a, 0x35, 0x59, 0xb9, 0xff, 0xf7, 0xea, 0xd9, 0x94, 0x6f, 0x33, - 0xc8, 0x07, 0x07, 0x11, 0xcd, 0xf9, 0x82, 0x47, 0x10, 0xce, 0xfd, 0x29, 0xc7, 0x56, 0xc6, 0x63, - 0xe8, 0x72, 0x51, 0x70, 0xa6, 0x40, 0xe8, 0x1a, 0xbd, 0x39, 0xdc, 0xa8, 0x67, 0xaf, 0xd7, 0x58, - 0xb8, 0x31, 0x45, 0x6c, 0x80, 0xf8, 0x31, 0x04, 0x53, 0x74, 0x45, 0x56, 0x0b, 0x41, 0x93, 0x71, - 0xa8, 0x47, 0xc3, 0x07, 0x1a, 0xf5, 0xec, 0x0d, 0x03, 0x8f, 0x23, 0xc4, 0x3f, 0x06, 0x91, 0xaf, - 0x0e, 0xba, 0x97, 0xa8, 0xc2, 0x3a, 0xfd, 0xe8, 0x20, 0x7c, 0xdc, 0xb2, 0x7c, 0x68, 0xc3, 0xd6, - 0xf6, 0xa4, 0x97, 0x34, 0x5f, 0xaf, 0x3d, 0x75, 0x6e, 0xa4, 0xd9, 0x8e, 0x46, 0x3d, 0x7b, 0xdb, - 0xa8, 0x6b, 0x65, 0x27, 0x7e, 0x7f, 0xcb, 0x94, 0xc8, 0x02, 0xba, 0x73, 0xa2, 0x57, 0xbe, 0x14, - 0x10, 0xce, 0x1b, 0xef, 0x5d, 0x35, 0x8c, 0xbc, 0x46, 0xee, 0x79, 0x74, 0xd6, 0xf9, 0x43, 0x94, - 0xd6, 0xad, 0x6a, 0xce, 0xf8, 0xbf, 0xd1, 0xde, 0x5c, 0x7f, 0xa3, 0x9e, 0xed, 0x33, 0x74, 0xe6, - 0x9d, 0xf8, 0x16, 0x40, 0x76, 0x1d, 0x34, 0xa2, 0xd9, 0x72, 0x7c, 0x15, 0x04, 0x7f, 0xc3, 0xa3, - 0xe0, 0x15, 0xc0, 0xfa, 0x5c, 0x10, 0x08, 0x2e, 0xe5, 0x3f, 0x9a, 0x68, 0xd1, 0xae, 0xd5, 0x39, - 0x1a, 0xac, 0xab, 0x19, 0xd4, 0x57, 0x84, 0x48, 0x09, 0x56, 0x54, 0x79, 0x16, 0x04, 0xb1, 0x94, - 0xa1, 0x46, 0x3d, 0x3b, 0x68, 0xa5, 0x9c, 0x0e, 0x13, 0xff, 0x5a, 0xfc, 0xbb, 0xc9, 0x34, 0xd1, - 0x48, 0xa3, 0x4b, 0xba, 0x0a, 0xfe, 0xe2, 0xa0, 0xb4, 0xd9, 0x6f, 0xfc, 0x38, 0x79, 0x0d, 0x5a, - 0xcf, 0x2a, 0x33, 0xfe, 0x17, 0x19, 0x46, 0x38, 0x19, 0xdb, 0x3d, 0xf8, 0xf1, 0xb9, 0xe7, 0x01, - 0xbe, 0x4f, 0x13, 0xcf, 0xdb, 0x1c, 0x19, 0xfe, 0xe5, 0xa0, 0x5b, 0xed, 0xd7, 0x0f, 0xcf, 0x76, - 0x50, 0x3b, 0xf1, 0x34, 0x33, 0x73, 0x17, 0x60, 0xb0, 0x6e, 0xde, 0x69, 0x37, 0x6f, 0xf1, 0x72, - 0xb2, 0x1b, 0xb3, 0x5f, 0x34, 0x7e, 0xde, 0xb6, 0xcb, 0xb1, 0x43, 0xb7, 0xe3, 0xb1, 0xef, 0xd0, - 0xd6, 0xfb, 0xc1, 0x07, 0x0e, 0xea, 0x6f, 0x59, 0x6c, 0x3c, 0xdd, 0xa9, 0xec, 0x36, 0xd7, 0x95, - 0x79, 0xd6, 0x5d, 0xb2, 0xb5, 0x3b, 0xaf, 0xed, 0xce, 0xe0, 0xe9, 0x4e, 0xec, 0xe6, 0x57, 0x05, - 0x84, 0x79, 0x6b, 0xf5, 0xc4, 0x33, 0xfe, 0xe9, 0xa0, 0x9b, 0x6d, 0x97, 0x1b, 0x3f, 0xef, 0x40, - 0x5c, 0xd2, 0x69, 0x66, 0x66, 0xbb, 0x27, 0xb0, 0x0e, 0x57, 0xb4, 0xc3, 0x65, 0xec, 0x5f, 0x7c, - 0xa0, 0x05, 0x5d, 0x28, 0x2f, 0x79, 0x14, 0xe4, 0xd7, 0x00, 0xd6, 0x73, 0x8b, 0x7b, 0x87, 0xae, - 0xb3, 0x7f, 0xe8, 0x3a, 0xdf, 0x0f, 0x5d, 0xe7, 0xd3, 0x91, 0x9b, 0xda, 0x3f, 0x72, 0x53, 0xdf, - 0x8e, 0xdc, 0xd4, 0xca, 0xd3, 0x52, 0x59, 0xad, 0x55, 0x0b, 0x5e, 0x11, 0x42, 0x1a, 0xf1, 0xaa, - 0x12, 0x10, 0x3d, 0x02, 0x51, 0x8a, 0xbf, 0xe9, 0xd6, 0x24, 0x7d, 0x7f, 0x56, 0x88, 0xaa, 0x55, - 0xb8, 0x2c, 0xa4, 0xf5, 0x7f, 0xde, 0x93, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0xf0, 0xc4, - 0xcf, 0xca, 0x07, 0x00, 0x00, + // 675 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcf, 0x4f, 0x13, 0x41, + 0x14, 0xee, 0xa2, 0x56, 0x19, 0x45, 0xc3, 0x80, 0x06, 0x1b, 0xdc, 0xca, 0x68, 0x0c, 0x26, 0xb8, + 0x23, 0x88, 0x1e, 0x40, 0x22, 0x14, 0x63, 0x4c, 0x0c, 0x09, 0xac, 0xc4, 0x03, 0x31, 0x69, 0xa6, + 0xdd, 0xa1, 0x34, 0xb0, 0xfb, 0xca, 0xcc, 0x94, 0xd8, 0x10, 0x2e, 0x98, 0x78, 0x36, 0xf1, 0xe8, + 0xff, 0xe0, 0xdf, 0xc1, 0x91, 0x84, 0x8b, 0xa7, 0xc6, 0x80, 0x7f, 0x41, 0x0f, 0x5e, 0xbc, 0x98, + 0xce, 0xcc, 0xf2, 0xc3, 0x96, 0x4d, 0x85, 0xc4, 0xdb, 0x76, 0xde, 0xf7, 0xbe, 0xf7, 0x7d, 0xef, + 0x47, 0x8a, 0x86, 0x41, 0x86, 0x20, 0xcb, 0x92, 0x2a, 0x58, 0xe5, 0xd1, 0x32, 0x2b, 0x2a, 0x10, + 0x35, 0xba, 0x31, 0x5a, 0xe0, 0x8a, 0x8d, 0xd2, 0xf5, 0x2a, 0x17, 0x35, 0xaf, 0x22, 0x40, 0x01, + 0x1e, 0xb4, 0x48, 0xef, 0x38, 0xd2, 0xb3, 0xc8, 0x4c, 0x7f, 0x09, 0x4a, 0xa0, 0x81, 0xb4, 0xf9, + 0x65, 0x72, 0x32, 0x83, 0x25, 0x80, 0xd2, 0x1a, 0xa7, 0xac, 0x52, 0xa6, 0x2c, 0x8a, 0x40, 0x31, + 0x55, 0x86, 0x48, 0xda, 0xe8, 0x50, 0xdb, 0xda, 0x15, 0x26, 0x58, 0x18, 0x43, 0xc6, 0x13, 0xe5, + 0xb1, 0xaa, 0x5a, 0x01, 0x51, 0x56, 0xb5, 0x39, 0xae, 0x58, 0xc0, 0x14, 0x33, 0x59, 0xa4, 0x1f, + 0xe1, 0x85, 0xa6, 0xf2, 0x79, 0x4d, 0xe5, 0xf3, 0xf5, 0x2a, 0x97, 0x8a, 0x2c, 0xa0, 0xbe, 0x13, + 0xaf, 0xb2, 0x02, 0x91, 0xe4, 0x78, 0x02, 0xa5, 0x4d, 0xc9, 0x01, 0xe7, 0xae, 0x33, 0x7c, 0x75, + 0x6c, 0xd0, 0x6b, 0x6b, 0xd4, 0x64, 0xe5, 0x2e, 0xee, 0xd4, 0xb3, 0x29, 0xdf, 0x66, 0x90, 0x8f, + 0x0e, 0x22, 0x9a, 0xf3, 0x25, 0x8f, 0x20, 0x9c, 0xf9, 0x5b, 0x8e, 0xad, 0x8c, 0x47, 0xd0, 0xe5, + 0xa2, 0xe0, 0x4c, 0x81, 0xd0, 0x35, 0xba, 0x73, 0xb8, 0x51, 0xcf, 0x5e, 0xaf, 0xb1, 0x70, 0x6d, + 0x82, 0xd8, 0x00, 0xf1, 0x63, 0x08, 0xa6, 0xe8, 0x8a, 0xac, 0x16, 0x82, 0x26, 0xe3, 0x40, 0x97, + 0x86, 0xf7, 0x35, 0xea, 0xd9, 0x1b, 0x06, 0x1e, 0x47, 0x88, 0x7f, 0x08, 0x22, 0xdf, 0x1c, 0x74, + 0x2f, 0x51, 0x85, 0x75, 0xfa, 0xc9, 0x41, 0xf8, 0xb0, 0x65, 0xf9, 0xd0, 0x86, 0xad, 0xed, 0x71, + 0x2f, 0x69, 0xbe, 0x5e, 0x7b, 0xea, 0xdc, 0x50, 0xb3, 0x1d, 0x8d, 0x7a, 0xf6, 0xb6, 0x51, 0xd7, + 0xca, 0x4e, 0xfc, 0xde, 0x96, 0x29, 0x91, 0x39, 0x74, 0xe7, 0x48, 0xaf, 0x7c, 0x25, 0x20, 0x9c, + 0x35, 0xde, 0xcf, 0xd4, 0x30, 0xf2, 0x06, 0xb9, 0xa7, 0xd1, 0x59, 0xe7, 0x0f, 0x51, 0x5a, 0xb7, + 0xaa, 0x39, 0xe3, 0x0b, 0xc3, 0xdd, 0xb9, 0xde, 0x46, 0x3d, 0xdb, 0x63, 0xe8, 0xcc, 0x3b, 0xf1, + 0x2d, 0x80, 0x6c, 0x3b, 0x68, 0x48, 0xb3, 0xe5, 0xf8, 0x32, 0x08, 0xfe, 0x96, 0x47, 0xc1, 0x6b, + 0x80, 0xd5, 0x99, 0x20, 0x10, 0x5c, 0xca, 0xff, 0x34, 0xd1, 0xa2, 0x5d, 0xab, 0x53, 0x34, 0x58, + 0x57, 0x53, 0xa8, 0xa7, 0x08, 0x91, 0x12, 0xac, 0xa8, 0xf2, 0x2c, 0x08, 0x62, 0x29, 0x03, 0x8d, + 0x7a, 0xb6, 0xdf, 0x4a, 0x39, 0x1e, 0x26, 0xfe, 0xb5, 0xf8, 0x77, 0x93, 0x69, 0xac, 0x91, 0x46, + 0x97, 0x74, 0x15, 0xfc, 0xd5, 0x41, 0x69, 0xb3, 0xdf, 0xf8, 0x71, 0xf2, 0x1a, 0xb4, 0x9e, 0x55, + 0x66, 0xf4, 0x1f, 0x32, 0x8c, 0x70, 0x32, 0xb2, 0xbd, 0xf7, 0xf3, 0x4b, 0xd7, 0x03, 0x7c, 0x9f, + 0x26, 0x9e, 0xb7, 0x39, 0x32, 0xfc, 0xdb, 0x41, 0xb7, 0xda, 0xaf, 0x1f, 0x9e, 0xee, 0xa0, 0x76, + 0xe2, 0x69, 0x66, 0x66, 0xce, 0xc1, 0x60, 0xdd, 0xbc, 0xd7, 0x6e, 0xde, 0xe1, 0xc5, 0x64, 0x37, + 0x66, 0xbf, 0x68, 0xfc, 0xbc, 0x69, 0x97, 0x63, 0x8b, 0x6e, 0xc6, 0x63, 0xdf, 0xa2, 0xad, 0xf7, + 0x83, 0xf7, 0x1c, 0xd4, 0xdb, 0xb2, 0xd8, 0x78, 0xb2, 0x53, 0xd9, 0x6d, 0xae, 0x2b, 0xf3, 0xfc, + 0x6c, 0xc9, 0xd6, 0xee, 0xac, 0xb6, 0x3b, 0x85, 0x27, 0x3b, 0xb1, 0x9b, 0x5f, 0x16, 0x10, 0xe6, + 0xad, 0xd5, 0x23, 0xcf, 0xf8, 0x97, 0x83, 0x6e, 0xb6, 0x5d, 0x6e, 0xfc, 0xa2, 0x03, 0x71, 0x49, + 0xa7, 0x99, 0x99, 0x3e, 0x3b, 0x81, 0x75, 0xb8, 0xa4, 0x1d, 0x2e, 0x62, 0xff, 0xfc, 0x03, 0x2d, + 0xe8, 0x42, 0x79, 0xc9, 0xa3, 0x20, 0xbf, 0x02, 0xb0, 0x9a, 0x9b, 0xdf, 0xd9, 0x77, 0x9d, 0xdd, + 0x7d, 0xd7, 0xf9, 0xb1, 0xef, 0x3a, 0x9f, 0x0f, 0xdc, 0xd4, 0xee, 0x81, 0x9b, 0xfa, 0x7e, 0xe0, + 0xa6, 0x96, 0x9e, 0x95, 0xca, 0x6a, 0xa5, 0x5a, 0xf0, 0x8a, 0x10, 0xd2, 0x88, 0x57, 0x95, 0x80, + 0xe8, 0x11, 0x88, 0x52, 0xfc, 0x4d, 0x37, 0x9e, 0xd2, 0x0f, 0x27, 0x85, 0xa8, 0x5a, 0x85, 0xcb, + 0x42, 0x5a, 0xff, 0xe7, 0x3d, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x77, 0x13, 0xa4, 0xf3, 0xca, + 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index e20ba1f2c..8611c6a88 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -858,72 +858,72 @@ func init() { var fileDescriptor_283b6c9a90a846b4 = []byte{ // 1064 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xf6, 0x47, 0x9a, 0x4c, 0x12, 0x92, 0x6c, 0x42, 0xe3, 0x2c, 0xa9, 0xb7, 0x2c, 0x2a, - 0x6a, 0x23, 0xbc, 0x2b, 0xa7, 0x21, 0x02, 0x4b, 0x08, 0xea, 0xa2, 0xa8, 0x07, 0x2c, 0x55, 0x9b, - 0x70, 0x41, 0x95, 0xac, 0xb1, 0x3d, 0xd9, 0xac, 0xcc, 0xce, 0xb8, 0x33, 0xe3, 0xa4, 0xb9, 0x55, - 0x70, 0xe3, 0xc4, 0x7f, 0x80, 0xb8, 0x20, 0x8e, 0x39, 0xf0, 0x07, 0x70, 0x2c, 0xb7, 0x8a, 0x13, - 0xa7, 0x15, 0x4a, 0x0e, 0x39, 0x70, 0xc2, 0x7f, 0x01, 0x9a, 0x1f, 0xbb, 0xf6, 0xae, 0x2d, 0x6c, - 0x1f, 0xaa, 0x5e, 0x5a, 0xef, 0xbc, 0xef, 0x7b, 0xfb, 0xbe, 0x6f, 0xde, 0xbc, 0xd9, 0x80, 0x7b, - 0x84, 0x45, 0x84, 0x85, 0xcc, 0xe3, 0xa4, 0x8d, 0xf0, 0x11, 0x6c, 0x72, 0x42, 0xcf, 0xbc, 0x93, - 0x72, 0x03, 0x71, 0x58, 0xf6, 0xf8, 0x0b, 0xb7, 0x43, 0x09, 0x27, 0xe6, 0x96, 0x86, 0xb9, 0x83, - 0x30, 0x57, 0xc3, 0xac, 0x55, 0x18, 0x85, 0x98, 0x78, 0xf2, 0x5f, 0x45, 0xb0, 0x8a, 0x4d, 0xc9, - 0xf0, 0x1a, 0x10, 0xb7, 0xd3, 0x74, 0xe2, 0x61, 0x28, 0xce, 0x50, 0x1a, 0x6f, 0x92, 0x10, 0xeb, - 0xf8, 0x86, 0x8e, 0x47, 0x2c, 0xf0, 0x4e, 0xca, 0xe2, 0x3f, 0x1d, 0xd8, 0x54, 0x81, 0xba, 0x7c, - 0xf2, 0xd4, 0x83, 0x0e, 0xad, 0x07, 0x24, 0x20, 0x6a, 0x5d, 0xfc, 0xd2, 0xab, 0xef, 0x8f, 0x54, - 0xd8, 0x81, 0x14, 0x46, 0x9a, 0xe8, 0xfc, 0x64, 0x80, 0x77, 0x6a, 0x2c, 0x78, 0x4c, 0x11, 0xe4, - 0xe8, 0x4b, 0x84, 0x49, 0x64, 0x3e, 0x00, 0xb3, 0x0c, 0xe1, 0x16, 0xa2, 0x05, 0xe3, 0xae, 0x71, - 0x7f, 0xbe, 0xba, 0xda, 0x8b, 0xed, 0xa5, 0x33, 0x18, 0x7d, 0x5b, 0x71, 0xd4, 0xba, 0xe3, 0x6b, - 0x80, 0xe9, 0x81, 0x39, 0xd6, 0x6d, 0xb4, 0x04, 0xad, 0x70, 0x4d, 0x82, 0xd7, 0x7a, 0xb1, 0xbd, - 0xac, 0xc1, 0x3a, 0xe2, 0xf8, 0x29, 0xa8, 0x52, 0xfe, 0xee, 0xea, 0x7c, 0x5b, 0xb3, 0x7f, 0xb8, - 0x3a, 0xdf, 0x1e, 0x5d, 0x61, 0x53, 0x56, 0x53, 0x52, 0xec, 0x67, 0xe0, 0x76, 0xb6, 0x40, 0x1f, - 0xb1, 0x0e, 0xc1, 0x0c, 0x99, 0x55, 0xb0, 0x8c, 0xd1, 0x69, 0x5d, 0x52, 0xeb, 0xaa, 0x08, 0x55, - 0xb1, 0xd5, 0x8b, 0xed, 0xdb, 0xaa, 0x88, 0x1c, 0xc0, 0xf1, 0x97, 0x30, 0x3a, 0x3d, 0x14, 0x0b, - 0x32, 0x97, 0xf3, 0x8f, 0x01, 0x6e, 0xd5, 0x58, 0x50, 0x0b, 0x31, 0x9f, 0x46, 0xf8, 0x13, 0x30, - 0x0b, 0x23, 0xd2, 0xc5, 0x5c, 0xca, 0x5e, 0xd8, 0xd9, 0x74, 0xf5, 0x76, 0x88, 0x4d, 0x4d, 0x9a, - 0xc3, 0x7d, 0x4c, 0x42, 0x5c, 0x7d, 0xf7, 0x55, 0x6c, 0xcf, 0xf4, 0x33, 0x29, 0x9a, 0xe3, 0x6b, - 0xbe, 0xf9, 0x05, 0x58, 0x8a, 0x42, 0xcc, 0x0f, 0xc9, 0xa3, 0x56, 0x8b, 0x22, 0xc6, 0x0a, 0xd7, - 0xf3, 0x12, 0x44, 0xb8, 0xce, 0x49, 0x1d, 0x2a, 0x80, 0xe3, 0x67, 0x09, 0x95, 0x07, 0x39, 0x4f, - 0x37, 0x47, 0x7a, 0x2a, 0x38, 0xce, 0x2a, 0x58, 0xd6, 0x62, 0x13, 0x13, 0x9d, 0x7f, 0x95, 0x01, - 0xd5, 0x2e, 0xc5, 0x6f, 0xc7, 0x80, 0x7d, 0xb0, 0xdc, 0xe8, 0x52, 0xbc, 0x4f, 0x49, 0x94, 0xb5, - 0x60, 0xab, 0x17, 0xdb, 0x05, 0xc5, 0x11, 0x80, 0xfa, 0x11, 0x25, 0x51, 0xdf, 0x84, 0x3c, 0x69, - 0x42, 0x1b, 0x04, 0x4b, 0xdb, 0x20, 0x24, 0xa7, 0x36, 0xfc, 0xa1, 0xcf, 0xc1, 0x31, 0xc4, 0x01, - 0x7a, 0xd4, 0x8a, 0xc2, 0xa9, 0xdc, 0xf8, 0x10, 0xdc, 0x1c, 0x3c, 0x04, 0x2b, 0xbd, 0xd8, 0x5e, - 0x54, 0x48, 0xdd, 0x75, 0x2a, 0x6c, 0x96, 0xc1, 0xbc, 0x68, 0x48, 0x28, 0xf2, 0x6b, 0x95, 0xeb, - 0xbd, 0xd8, 0x5e, 0xe9, 0xf7, 0xaa, 0x0c, 0x39, 0xfe, 0x1c, 0x46, 0xa7, 0xb2, 0x8a, 0x49, 0x4f, - 0x8c, 0xac, 0xbb, 0xa4, 0xd8, 0x05, 0x75, 0x62, 0xfa, 0x52, 0x52, 0x95, 0x17, 0x06, 0x58, 0xaf, - 0xb1, 0xe0, 0x00, 0xf1, 0x2a, 0x3a, 0x22, 0x14, 0x1d, 0x20, 0xdc, 0x7a, 0x42, 0x48, 0xfb, 0x4d, - 0x68, 0xfd, 0x0c, 0x2c, 0x35, 0x09, 0xe6, 0x14, 0x36, 0xb9, 0xdc, 0x35, 0xad, 0xb7, 0xd0, 0x8b, - 0xed, 0x75, 0x85, 0xcf, 0x84, 0x1d, 0x7f, 0x31, 0x79, 0x16, 0x3b, 0x5a, 0xf9, 0x24, 0xa7, 0xfb, - 0xfe, 0x48, 0xdd, 0x0c, 0xf1, 0x52, 0x43, 0x4a, 0x11, 0xc8, 0xd2, 0x31, 0x21, 0x6d, 0xa7, 0x08, - 0xb6, 0x46, 0x69, 0x4c, 0x4d, 0xf8, 0xd9, 0x00, 0x6b, 0x0a, 0x20, 0x47, 0x40, 0x0d, 0x71, 0xd8, - 0x82, 0x1c, 0x4e, 0xe3, 0x81, 0x0f, 0xe6, 0x22, 0x4d, 0xd3, 0xfd, 0x7f, 0xa7, 0xdf, 0xff, 0xb8, - 0x9d, 0xf6, 0x7f, 0x92, 0xbb, 0xba, 0xa1, 0xcf, 0x80, 0x1e, 0x8d, 0x09, 0xd9, 0xf1, 0xd3, 0x3c, - 0x95, 0x85, 0x01, 0xc1, 0xce, 0x1d, 0xf0, 0xde, 0x88, 0x12, 0x53, 0x09, 0xf1, 0x35, 0xb0, 0x52, - 0x63, 0xc1, 0x3e, 0xa1, 0x4d, 0x74, 0x48, 0x21, 0x66, 0x47, 0x88, 0xbe, 0x9d, 0xd3, 0xeb, 0x83, - 0x35, 0xae, 0x0b, 0x18, 0x3e, 0xc1, 0x77, 0x7b, 0xb1, 0xbd, 0xa5, 0x78, 0x09, 0x28, 0x77, 0x8a, - 0x47, 0x91, 0xcd, 0xaf, 0xc0, 0x6a, 0xb2, 0xdc, 0x1f, 0x8b, 0x37, 0x64, 0xc6, 0x62, 0x2f, 0xb6, - 0xad, 0x5c, 0xc6, 0xc1, 0xd1, 0x38, 0x4c, 0xac, 0x3c, 0xcc, 0x35, 0xd2, 0x07, 0x23, 0x1b, 0xe9, - 0x48, 0x58, 0x59, 0x4a, 0xd8, 0x8e, 0x05, 0x0a, 0x79, 0x7f, 0x53, 0xf3, 0x7f, 0x37, 0xe4, 0xf8, - 0xf8, 0xba, 0xd3, 0x82, 0x1c, 0x3d, 0x95, 0x97, 0xa9, 0xb9, 0x07, 0xe6, 0x61, 0x97, 0x1f, 0x13, - 0x1a, 0xf2, 0x33, 0x6d, 0x7f, 0xe1, 0xcf, 0xdf, 0x4a, 0xeb, 0xda, 0x56, 0x5d, 0xcb, 0x01, 0xa7, - 0x21, 0x0e, 0xfc, 0x3e, 0xd4, 0xfc, 0x1c, 0xcc, 0xaa, 0xeb, 0x58, 0x6f, 0xc4, 0x96, 0x3b, 0xf2, - 0x6b, 0x43, 0xbd, 0xa5, 0x3a, 0x2f, 0xf6, 0xe2, 0xd7, 0xab, 0xf3, 0x6d, 0xc3, 0xd7, 0xb4, 0xca, - 0xae, 0x50, 0xd7, 0x4f, 0x28, 0x27, 0x44, 0x88, 0x39, 0xa2, 0xcd, 0x63, 0x18, 0xe2, 0xe7, 0x5d, - 0x44, 0x43, 0xc4, 0xbc, 0x5c, 0xb9, 0xce, 0x26, 0xd8, 0xc8, 0x2d, 0x25, 0xea, 0x76, 0x7e, 0xb9, - 0x05, 0xae, 0xd7, 0x58, 0x60, 0x3e, 0x07, 0x0b, 0x83, 0x1f, 0x05, 0x1f, 0xb9, 0xff, 0xf7, 0x19, - 0xe4, 0x66, 0x6f, 0x68, 0x6b, 0x77, 0x1a, 0x74, 0x7a, 0x9f, 0x3f, 0x03, 0x37, 0xe4, 0x3d, 0x7c, - 0x6f, 0x2c, 0x5b, 0xc0, 0xac, 0xd2, 0x44, 0xb0, 0xc1, 0xec, 0xf2, 0x92, 0x1b, 0x9f, 0x5d, 0xc0, - 0x26, 0xc8, 0x3e, 0x78, 0x7f, 0x48, 0xbb, 0x06, 0xee, 0x8e, 0x09, 0xec, 0xea, 0xa3, 0x27, 0xb1, - 0x6b, 0x78, 0x98, 0x9b, 0x2f, 0x0d, 0xb0, 0x32, 0x34, 0xc4, 0xca, 0x63, 0x53, 0xe5, 0x29, 0xd6, - 0xa7, 0x53, 0x53, 0xd2, 0x12, 0xbe, 0x37, 0xc0, 0xea, 0xf0, 0x65, 0xb2, 0x33, 0x49, 0xc2, 0x2c, - 0xc7, 0xaa, 0x4c, 0xcf, 0x49, 0xab, 0x38, 0x05, 0x4b, 0xd9, 0x49, 0xe8, 0x8e, 0x4d, 0x96, 0xc1, - 0x5b, 0x7b, 0xd3, 0xe1, 0xd3, 0x17, 0x73, 0xb0, 0x98, 0x99, 0x02, 0xe3, 0x7b, 0x66, 0x10, 0x6e, - 0x7d, 0x3c, 0x15, 0x3c, 0x79, 0xab, 0x75, 0xf3, 0xa5, 0x98, 0x00, 0xd5, 0xa7, 0xaf, 0x2e, 0x8a, - 0xc6, 0xeb, 0x8b, 0xa2, 0xf1, 0xf7, 0x45, 0xd1, 0xf8, 0xf1, 0xb2, 0x38, 0xf3, 0xfa, 0xb2, 0x38, - 0xf3, 0xd7, 0x65, 0x71, 0xe6, 0x9b, 0xbd, 0x20, 0xe4, 0xc7, 0xdd, 0x86, 0xdb, 0x24, 0x91, 0x87, - 0x51, 0x97, 0x53, 0x82, 0x4b, 0x84, 0x06, 0xc9, 0x6f, 0xef, 0x64, 0xd7, 0x7b, 0x91, 0x9d, 0x7e, - 0xfc, 0xac, 0x83, 0x58, 0x63, 0x56, 0xfe, 0x49, 0xf0, 0xf0, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xab, 0x2e, 0xa9, 0x6f, 0x19, 0x0d, 0x00, 0x00, + 0x14, 0xce, 0xf6, 0x47, 0xda, 0x4c, 0x12, 0x92, 0x6c, 0x42, 0xe3, 0x2c, 0xa9, 0xb7, 0x2c, 0x2a, + 0x6a, 0x23, 0xbc, 0x2b, 0xa7, 0x6d, 0x04, 0x96, 0x10, 0xd4, 0x45, 0x51, 0x0f, 0x58, 0xaa, 0x36, + 0xe1, 0x82, 0x2a, 0x59, 0x63, 0x7b, 0xb2, 0x5e, 0x99, 0x9d, 0x71, 0x67, 0xc6, 0x49, 0x73, 0xab, + 0xe0, 0xc6, 0x89, 0xff, 0x00, 0x71, 0x41, 0x1c, 0x73, 0xe0, 0x0f, 0xe0, 0x58, 0x6e, 0x15, 0x27, + 0x4e, 0x2b, 0x94, 0x1c, 0x72, 0xe0, 0x84, 0xff, 0x02, 0x34, 0x3f, 0x76, 0xed, 0x5d, 0x5b, 0xd8, + 0x3e, 0xa0, 0x5e, 0x5a, 0xef, 0xbc, 0xef, 0x7b, 0xfb, 0xbe, 0x6f, 0xde, 0xbc, 0xd9, 0x80, 0xbb, + 0x84, 0x45, 0x84, 0x85, 0xcc, 0xe3, 0xa4, 0x83, 0xf0, 0x11, 0x6c, 0x72, 0x42, 0x4f, 0xbd, 0xe3, + 0x72, 0x03, 0x71, 0x58, 0xf6, 0xf8, 0x4b, 0xb7, 0x4b, 0x09, 0x27, 0xe6, 0xb6, 0x86, 0xb9, 0xc3, + 0x30, 0x57, 0xc3, 0xac, 0x35, 0x18, 0x85, 0x98, 0x78, 0xf2, 0x5f, 0x45, 0xb0, 0x8a, 0x4d, 0xc9, + 0xf0, 0x1a, 0x10, 0x77, 0xd2, 0x74, 0xe2, 0x61, 0x24, 0xce, 0x50, 0x1a, 0x6f, 0x92, 0x10, 0xeb, + 0xf8, 0xa6, 0x8e, 0x47, 0x2c, 0xf0, 0x8e, 0xcb, 0xe2, 0x3f, 0x1d, 0xd8, 0x52, 0x81, 0xba, 0x7c, + 0xf2, 0xd4, 0x83, 0x0e, 0x6d, 0x04, 0x24, 0x20, 0x6a, 0x5d, 0xfc, 0xd2, 0xab, 0xef, 0x8f, 0x55, + 0xd8, 0x85, 0x14, 0x46, 0x9a, 0xe8, 0xfc, 0x68, 0x80, 0x77, 0x6a, 0x2c, 0x78, 0x42, 0x11, 0xe4, + 0xe8, 0x0b, 0x84, 0x49, 0x64, 0xde, 0x07, 0xf3, 0x0c, 0xe1, 0x16, 0xa2, 0x05, 0xe3, 0x8e, 0x71, + 0x6f, 0xa1, 0xba, 0xd6, 0x8f, 0xed, 0xe5, 0x53, 0x18, 0x7d, 0x53, 0x71, 0xd4, 0xba, 0xe3, 0x6b, + 0x80, 0xe9, 0x81, 0x9b, 0xac, 0xd7, 0x68, 0x09, 0x5a, 0xe1, 0x8a, 0x04, 0xaf, 0xf7, 0x63, 0x7b, + 0x45, 0x83, 0x75, 0xc4, 0xf1, 0x53, 0x50, 0xa5, 0xfc, 0xed, 0xe5, 0xd9, 0x8e, 0x66, 0x7f, 0x7f, + 0x79, 0xb6, 0x33, 0xbe, 0xc2, 0xa6, 0xac, 0xa6, 0xa4, 0xd8, 0xcf, 0xc1, 0xad, 0x6c, 0x81, 0x3e, + 0x62, 0x5d, 0x82, 0x19, 0x32, 0xab, 0x60, 0x05, 0xa3, 0x93, 0xba, 0xa4, 0xd6, 0x55, 0x11, 0xaa, + 0x62, 0xab, 0x1f, 0xdb, 0xb7, 0x54, 0x11, 0x39, 0x80, 0xe3, 0x2f, 0x63, 0x74, 0x72, 0x28, 0x16, + 0x64, 0x2e, 0xe7, 0x6f, 0x03, 0xdc, 0xa8, 0xb1, 0xa0, 0x16, 0x62, 0x3e, 0x8b, 0xf0, 0xa7, 0x60, + 0x1e, 0x46, 0xa4, 0x87, 0xb9, 0x94, 0xbd, 0xb8, 0xbb, 0xe5, 0xea, 0xed, 0x10, 0x9b, 0x9a, 0x34, + 0x87, 0xfb, 0x84, 0x84, 0xb8, 0xfa, 0xee, 0xeb, 0xd8, 0x9e, 0x1b, 0x64, 0x52, 0x34, 0xc7, 0xd7, + 0x7c, 0xf3, 0x73, 0xb0, 0x1c, 0x85, 0x98, 0x1f, 0x92, 0xc7, 0xad, 0x16, 0x45, 0x8c, 0x15, 0xae, + 0xe6, 0x25, 0x88, 0x70, 0x9d, 0x93, 0x3a, 0x54, 0x00, 0xc7, 0xcf, 0x12, 0x2a, 0xf7, 0x73, 0x9e, + 0x6e, 0x8d, 0xf5, 0x54, 0x70, 0x9c, 0x35, 0xb0, 0xa2, 0xc5, 0x26, 0x26, 0x3a, 0xff, 0x28, 0x03, + 0xaa, 0x3d, 0x8a, 0xdf, 0x8e, 0x01, 0xfb, 0x60, 0xa5, 0xd1, 0xa3, 0x78, 0x9f, 0x92, 0x28, 0x6b, + 0xc1, 0x76, 0x3f, 0xb6, 0x0b, 0x8a, 0x23, 0x00, 0xf5, 0x23, 0x4a, 0xa2, 0x81, 0x09, 0x79, 0xd2, + 0x94, 0x36, 0x08, 0x96, 0xb6, 0x41, 0x48, 0x4e, 0x6d, 0xf8, 0x5d, 0x9f, 0x83, 0x36, 0xc4, 0x01, + 0x7a, 0xdc, 0x8a, 0xc2, 0x99, 0xdc, 0xf8, 0x10, 0x5c, 0x1f, 0x3e, 0x04, 0xab, 0xfd, 0xd8, 0x5e, + 0x52, 0x48, 0xdd, 0x75, 0x2a, 0x6c, 0x96, 0xc1, 0x82, 0x68, 0x48, 0x28, 0xf2, 0x6b, 0x95, 0x1b, + 0xfd, 0xd8, 0x5e, 0x1d, 0xf4, 0xaa, 0x0c, 0x39, 0xfe, 0x4d, 0x8c, 0x4e, 0x64, 0x15, 0xd3, 0x9e, + 0x18, 0x59, 0x77, 0x49, 0xb1, 0x0b, 0xea, 0xc4, 0x0c, 0xa4, 0xa4, 0x2a, 0xcf, 0x0d, 0xb0, 0x51, + 0x63, 0xc1, 0x01, 0xe2, 0x55, 0x74, 0x44, 0x28, 0x3a, 0x40, 0xb8, 0xf5, 0x94, 0x90, 0xce, 0xff, + 0xa1, 0xf5, 0x53, 0xb0, 0xdc, 0x24, 0x98, 0x53, 0xd8, 0xe4, 0x72, 0xd7, 0xb4, 0xde, 0x42, 0x3f, + 0xb6, 0x37, 0x14, 0x3e, 0x13, 0x76, 0xfc, 0xa5, 0xe4, 0x59, 0xec, 0x68, 0xe5, 0xe3, 0x9c, 0xee, + 0x7b, 0x63, 0x75, 0x33, 0xc4, 0x4b, 0x0d, 0x29, 0x45, 0x20, 0x4b, 0x6d, 0x42, 0x3a, 0x4e, 0x11, + 0x6c, 0x8f, 0xd3, 0x98, 0x9a, 0xf0, 0x93, 0x01, 0xd6, 0x15, 0x40, 0x8e, 0x80, 0x1a, 0xe2, 0xb0, + 0x05, 0x39, 0x9c, 0xc5, 0x03, 0x1f, 0xdc, 0x8c, 0x34, 0x4d, 0xf7, 0xff, 0xed, 0x41, 0xff, 0xe3, + 0x4e, 0xda, 0xff, 0x49, 0xee, 0xea, 0xa6, 0x3e, 0x03, 0x7a, 0x34, 0x26, 0x64, 0xc7, 0x4f, 0xf3, + 0x54, 0x16, 0x87, 0x04, 0x3b, 0xb7, 0xc1, 0x7b, 0x63, 0x4a, 0x4c, 0x25, 0xc4, 0x57, 0xc0, 0x6a, + 0x8d, 0x05, 0xfb, 0x84, 0x36, 0xd1, 0x21, 0x85, 0x98, 0x1d, 0x21, 0xfa, 0x76, 0x4e, 0xaf, 0x0f, + 0xd6, 0xb9, 0x2e, 0x60, 0xf4, 0x04, 0xdf, 0xe9, 0xc7, 0xf6, 0xb6, 0xe2, 0x25, 0xa0, 0xdc, 0x29, + 0x1e, 0x47, 0x36, 0xbf, 0x04, 0x6b, 0xc9, 0xf2, 0x60, 0x2c, 0x5e, 0x93, 0x19, 0x8b, 0xfd, 0xd8, + 0xb6, 0x72, 0x19, 0x87, 0x47, 0xe3, 0x28, 0xb1, 0xf2, 0x20, 0xd7, 0x48, 0x1f, 0x8c, 0x6d, 0xa4, + 0x23, 0x61, 0x65, 0x29, 0x61, 0x3b, 0x16, 0x28, 0xe4, 0xfd, 0x4d, 0xcd, 0xff, 0xcd, 0x90, 0xe3, + 0xe3, 0xab, 0x6e, 0x0b, 0x72, 0xf4, 0x4c, 0x5e, 0xa6, 0xe6, 0x1e, 0x58, 0x80, 0x3d, 0xde, 0x26, + 0x34, 0xe4, 0xa7, 0xda, 0xfe, 0xc2, 0x1f, 0xbf, 0x96, 0x36, 0xb4, 0xad, 0xba, 0x96, 0x03, 0x4e, + 0x43, 0x1c, 0xf8, 0x03, 0xa8, 0xf9, 0x19, 0x98, 0x57, 0xd7, 0xb1, 0xde, 0x88, 0x6d, 0x77, 0xec, + 0xd7, 0x86, 0x7a, 0x4b, 0x75, 0x41, 0xec, 0xc5, 0x2f, 0x97, 0x67, 0x3b, 0x86, 0xaf, 0x69, 0x95, + 0x87, 0x42, 0xdd, 0x20, 0xa1, 0x9c, 0x10, 0x21, 0xe6, 0x88, 0x36, 0xdb, 0x30, 0xc4, 0x2f, 0x7a, + 0x88, 0x86, 0x88, 0x79, 0xb9, 0x72, 0x9d, 0x2d, 0xb0, 0x99, 0x5b, 0x4a, 0xd4, 0xed, 0xfe, 0x7c, + 0x03, 0x5c, 0xad, 0xb1, 0xc0, 0x7c, 0x01, 0x16, 0x87, 0x3f, 0x0a, 0x3e, 0x72, 0xff, 0xeb, 0x33, + 0xc8, 0xcd, 0xde, 0xd0, 0xd6, 0xc3, 0x59, 0xd0, 0xe9, 0x7d, 0xfe, 0x1c, 0x5c, 0x93, 0xf7, 0xf0, + 0xdd, 0x89, 0x6c, 0x01, 0xb3, 0x4a, 0x53, 0xc1, 0x86, 0xb3, 0xcb, 0x4b, 0x6e, 0x72, 0x76, 0x01, + 0x9b, 0x22, 0xfb, 0xf0, 0xfd, 0x21, 0xed, 0x1a, 0xba, 0x3b, 0xa6, 0xb0, 0x6b, 0x80, 0x9e, 0xc6, + 0xae, 0xd1, 0x61, 0x6e, 0xbe, 0x32, 0xc0, 0xea, 0xc8, 0x10, 0x2b, 0x4f, 0x4c, 0x95, 0xa7, 0x58, + 0x9f, 0xcc, 0x4c, 0x49, 0x4b, 0xf8, 0xce, 0x00, 0x6b, 0xa3, 0x97, 0xc9, 0xee, 0x34, 0x09, 0xb3, + 0x1c, 0xab, 0x32, 0x3b, 0x27, 0xad, 0xe2, 0x04, 0x2c, 0x67, 0x27, 0xa1, 0x3b, 0x31, 0x59, 0x06, + 0x6f, 0xed, 0xcd, 0x86, 0x4f, 0x5f, 0xcc, 0xc1, 0x52, 0x66, 0x0a, 0x4c, 0xee, 0x99, 0x61, 0xb8, + 0xf5, 0x68, 0x26, 0x78, 0xf2, 0x56, 0xeb, 0xfa, 0x2b, 0x31, 0x01, 0xaa, 0xcf, 0x5e, 0x9f, 0x17, + 0x8d, 0x37, 0xe7, 0x45, 0xe3, 0xaf, 0xf3, 0xa2, 0xf1, 0xc3, 0x45, 0x71, 0xee, 0xcd, 0x45, 0x71, + 0xee, 0xcf, 0x8b, 0xe2, 0xdc, 0xd7, 0x7b, 0x41, 0xc8, 0xdb, 0xbd, 0x86, 0xdb, 0x24, 0x91, 0x87, + 0x51, 0x8f, 0x53, 0x82, 0x4b, 0x84, 0x06, 0xc9, 0x6f, 0xef, 0xf8, 0x91, 0xf7, 0x32, 0x3b, 0xfd, + 0xf8, 0x69, 0x17, 0xb1, 0xc6, 0xbc, 0xfc, 0x93, 0xe0, 0xc1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xa3, 0xcd, 0xc9, 0x53, 0x19, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/v1beta1/params.pb.go b/x/tokenfactory/types/v1beta1/params.pb.go index cf863a97c..7219dbd6d 100644 --- a/x/tokenfactory/types/v1beta1/params.pb.go +++ b/x/tokenfactory/types/v1beta1/params.pb.go @@ -105,31 +105,31 @@ func init() { } var fileDescriptor_cc8299d306f3ff47 = []byte{ - // 376 bytes of a gzipped FileDescriptorProto + // 377 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xbd, 0x6e, 0xe2, 0x40, 0x10, 0xf6, 0xc2, 0x09, 0xe9, 0x7c, 0xcd, 0xc9, 0x77, 0xa7, 0x03, 0x74, 0xb2, 0x39, 0x57, 0xa6, - 0xc0, 0x2b, 0x48, 0xaa, 0x14, 0x91, 0x82, 0xa5, 0xa4, 0x8a, 0x14, 0x51, 0x45, 0x69, 0xac, 0xb5, - 0x3d, 0x76, 0x2c, 0xf0, 0x0e, 0xf2, 0x2e, 0x28, 0xbc, 0x45, 0xaa, 0x3c, 0x44, 0xde, 0x21, 0x3d, - 0x25, 0x65, 0x2a, 0x27, 0x82, 0x37, 0xe0, 0x09, 0x22, 0xfc, 0x13, 0x41, 0x92, 0xca, 0x33, 0xf3, - 0x7d, 0xf3, 0xcd, 0xe7, 0x99, 0x55, 0xbb, 0x28, 0x12, 0x14, 0xb1, 0xa0, 0x12, 0xc7, 0xc0, 0x43, - 0xe6, 0x4b, 0x4c, 0x17, 0x74, 0xde, 0xf7, 0x40, 0xb2, 0x3e, 0x9d, 0xb2, 0x94, 0x25, 0xc2, 0x9e, - 0xa6, 0x28, 0x51, 0xfb, 0x57, 0x52, 0xed, 0x7d, 0xaa, 0x5d, 0x52, 0xdb, 0xba, 0x9f, 0xc3, 0xd4, - 0x63, 0x02, 0xde, 0xfb, 0x7d, 0x8c, 0x79, 0xd1, 0xdd, 0x6e, 0x15, 0xb8, 0x9b, 0x67, 0xb4, 0x48, - 0x4a, 0xe8, 0x77, 0x84, 0x11, 0x16, 0xf5, 0x5d, 0x54, 0x54, 0xcd, 0xa7, 0x9a, 0xda, 0xb8, 0xca, - 0xe7, 0x6b, 0x0f, 0x44, 0xd5, 0x02, 0xe0, 0x98, 0xb8, 0x7e, 0x0a, 0x4c, 0xc6, 0xc8, 0xdd, 0x10, - 0xa0, 0x49, 0x3a, 0x75, 0xeb, 0xc7, 0xa0, 0x65, 0x97, 0x62, 0xbb, 0xc9, 0x95, 0x1d, 0xdb, 0xc1, - 0x98, 0x0f, 0x2f, 0x97, 0x99, 0xa1, 0x6c, 0x33, 0xa3, 0xb5, 0x60, 0xc9, 0xe4, 0xc4, 0xfc, 0x2c, - 0x61, 0x3e, 0xbe, 0x18, 0x56, 0x14, 0xcb, 0xdb, 0x99, 0x67, 0xfb, 0x98, 0x94, 0xb6, 0xca, 0x4f, - 0x4f, 0x04, 0x63, 0x2a, 0x17, 0x53, 0x10, 0xb9, 0x9a, 0x18, 0xfd, 0xcc, 0x05, 0x9c, 0xb2, 0xff, - 0x1c, 0x40, 0x0b, 0xd5, 0xf6, 0x07, 0xd1, 0x88, 0x09, 0xd7, 0x47, 0x2e, 0x66, 0x09, 0x34, 0x6b, - 0x1d, 0x62, 0x7d, 0x1b, 0x76, 0x97, 0x99, 0x41, 0xb6, 0x99, 0xf1, 0xff, 0x4b, 0x13, 0x7b, 0x7c, - 0x73, 0xf4, 0xf7, 0x60, 0xc0, 0x05, 0x13, 0x4e, 0x81, 0x68, 0x03, 0xf5, 0x4f, 0x08, 0xe0, 0xfa, - 0x38, 0x99, 0xc0, 0x6e, 0xed, 0x2e, 0x0b, 0x82, 0x14, 0x84, 0x68, 0xd6, 0x3b, 0xc4, 0xfa, 0x3e, - 0xfa, 0x15, 0x02, 0x38, 0x15, 0x76, 0x56, 0x40, 0xc3, 0xeb, 0xe5, 0x5a, 0x27, 0xab, 0xb5, 0x4e, - 0x5e, 0xd7, 0x3a, 0xb9, 0xdf, 0xe8, 0xca, 0x6a, 0xa3, 0x2b, 0xcf, 0x1b, 0x5d, 0xb9, 0x39, 0xdd, - 0xfb, 0x63, 0x0e, 0x33, 0x99, 0x22, 0xef, 0x61, 0x1a, 0x55, 0x31, 0x9d, 0x1f, 0xd3, 0xbb, 0xc3, - 0xf7, 0x90, 0x6f, 0xa1, 0xba, 0xaa, 0xd7, 0xc8, 0x0f, 0x74, 0xf4, 0x16, 0x00, 0x00, 0xff, 0xff, - 0xc4, 0x5e, 0x24, 0x25, 0x3c, 0x02, 0x00, 0x00, + 0xc0, 0x2b, 0x88, 0xd2, 0xa4, 0x88, 0x14, 0x2c, 0x25, 0x55, 0xa4, 0x88, 0x2a, 0x4a, 0x63, 0xad, + 0xed, 0xb1, 0x63, 0x81, 0x77, 0x90, 0x77, 0x41, 0xe1, 0x2d, 0x52, 0xe5, 0x21, 0xf2, 0x0e, 0xe9, + 0x29, 0x29, 0x53, 0x39, 0x11, 0xbc, 0x01, 0x4f, 0x10, 0xe1, 0x9f, 0x08, 0x92, 0x54, 0x9e, 0x99, + 0xef, 0x9b, 0x6f, 0x3e, 0xcf, 0xac, 0xda, 0x45, 0x91, 0xa0, 0x88, 0x05, 0x95, 0x38, 0x06, 0x1e, + 0x32, 0x5f, 0x62, 0xba, 0xa0, 0xf3, 0xbe, 0x07, 0x92, 0xf5, 0xe9, 0x94, 0xa5, 0x2c, 0x11, 0xf6, + 0x34, 0x45, 0x89, 0xda, 0xbf, 0x92, 0x6a, 0xef, 0x53, 0xed, 0x92, 0xda, 0xd6, 0xfd, 0x1c, 0xa6, + 0x1e, 0x13, 0xf0, 0xde, 0xef, 0x63, 0xcc, 0x8b, 0xee, 0x76, 0xab, 0xc0, 0xdd, 0x3c, 0xa3, 0x45, + 0x52, 0x42, 0xbf, 0x23, 0x8c, 0xb0, 0xa8, 0xef, 0xa2, 0xa2, 0x6a, 0x3e, 0xd5, 0xd4, 0xc6, 0x55, + 0x3e, 0x5f, 0x7b, 0x20, 0xaa, 0x16, 0x00, 0xc7, 0xc4, 0xf5, 0x53, 0x60, 0x32, 0x46, 0xee, 0x86, + 0x00, 0x4d, 0xd2, 0xa9, 0x5b, 0x3f, 0x06, 0x2d, 0xbb, 0x14, 0xdb, 0x4d, 0xae, 0xec, 0xd8, 0x0e, + 0xc6, 0x7c, 0x78, 0xb9, 0xcc, 0x0c, 0x65, 0x9b, 0x19, 0xad, 0x05, 0x4b, 0x26, 0x27, 0xe6, 0x67, + 0x09, 0xf3, 0xf1, 0xc5, 0xb0, 0xa2, 0x58, 0xde, 0xce, 0x3c, 0xdb, 0xc7, 0xa4, 0xb4, 0x55, 0x7e, + 0x7a, 0x22, 0x18, 0x53, 0xb9, 0x98, 0x82, 0xc8, 0xd5, 0xc4, 0xe8, 0x67, 0x2e, 0xe0, 0x94, 0xfd, + 0xe7, 0x00, 0x5a, 0xa8, 0xb6, 0x3f, 0x88, 0x46, 0x4c, 0xb8, 0x3e, 0x72, 0x31, 0x4b, 0xa0, 0x59, + 0xeb, 0x10, 0xeb, 0xdb, 0xb0, 0xbb, 0xcc, 0x0c, 0xb2, 0xcd, 0x8c, 0xff, 0x5f, 0x9a, 0xd8, 0xe3, + 0x9b, 0xa3, 0xbf, 0x07, 0x03, 0x2e, 0x98, 0x70, 0x0a, 0x44, 0x1b, 0xa8, 0x7f, 0x42, 0x00, 0xd7, + 0xc7, 0xc9, 0x04, 0x76, 0x6b, 0x77, 0x59, 0x10, 0xa4, 0x20, 0x44, 0xb3, 0xde, 0x21, 0xd6, 0xf7, + 0xd1, 0xaf, 0x10, 0xc0, 0xa9, 0xb0, 0xb3, 0x02, 0x1a, 0x5e, 0x2f, 0xd7, 0x3a, 0x59, 0xad, 0x75, + 0xf2, 0xba, 0xd6, 0xc9, 0xfd, 0x46, 0x57, 0x56, 0x1b, 0x5d, 0x79, 0xde, 0xe8, 0xca, 0xcd, 0xe9, + 0xde, 0x1f, 0x73, 0x98, 0xc9, 0x14, 0x79, 0x0f, 0xd3, 0xa8, 0x8a, 0xe9, 0xfc, 0x98, 0xde, 0x1d, + 0xbe, 0x87, 0x7c, 0x0b, 0xd5, 0x55, 0xbd, 0x46, 0x7e, 0xa0, 0xa3, 0xb7, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x26, 0xa3, 0xac, 0xa8, 0x3c, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/transfer/ibc_handlers.go b/x/transfer/ibc_handlers.go index 9ccd06b86..3c911599c 100644 --- a/x/transfer/ibc_handlers.go +++ b/x/transfer/ibc_handlers.go @@ -7,9 +7,9 @@ import ( transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - "github.com/neutron-org/neutron/v4/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/interchaintxs/types" ) // HandleAcknowledgement passes the acknowledgement data to the appropriate contract via a sudo call. @@ -32,7 +32,6 @@ func (im IBCModule) HandleAcknowledgement(ctx sdk.Context, packet channeltypes.P } im.wrappedKeeper.FeeKeeper.DistributeAcknowledgementFee(ctx, relayer, feetypes.NewPacketID(packet.SourcePort, packet.SourceChannel, packet.Sequence)) - msg, err := keeper.PrepareSudoCallbackMessage(packet, &ack) if err != nil { return errors.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal Packet/Acknowledgment: %v", err) diff --git a/x/transfer/ibc_handlers_test.go b/x/transfer/ibc_handlers_test.go index 61f0b6540..e6ccadc1a 100644 --- a/x/transfer/ibc_handlers_test.go +++ b/x/transfer/ibc_handlers_test.go @@ -6,7 +6,7 @@ import ( types2 "cosmossdk.io/store/types" - "github.com/neutron-org/neutron/v4/x/contractmanager/keeper" + "github.com/neutron-org/neutron/v5/x/contractmanager/keeper" sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" @@ -14,12 +14,12 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/neutron-org/neutron/v4/testutil" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/transfer/types" - testkeeper "github.com/neutron-org/neutron/v4/testutil/transfer/keeper" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - ictxtypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types" - "github.com/neutron-org/neutron/v4/x/transfer" + "github.com/neutron-org/neutron/v5/testutil" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/transfer/types" + testkeeper "github.com/neutron-org/neutron/v5/testutil/transfer/keeper" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + ictxtypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types" + "github.com/neutron-org/neutron/v5/x/transfer" ) const TestCosmosAddress = "cosmos10h9stc5v6ntgeygf5xf945njqq5h32r53uquvw" diff --git a/x/transfer/keeper/keeper.go b/x/transfer/keeper/keeper.go index 56e630cd0..191a1ae4f 100644 --- a/x/transfer/keeper/keeper.go +++ b/x/transfer/keeper/keeper.go @@ -16,8 +16,8 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - wrappedtypes "github.com/neutron-org/neutron/v4/x/transfer/types" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + wrappedtypes "github.com/neutron-org/neutron/v5/x/transfer/types" ) // KeeperTransferWrapper is a wrapper for original ibc keeper to override response for "Transfer" method diff --git a/x/transfer/keeper/keeper_test.go b/x/transfer/keeper/keeper_test.go index 7ba8be0a3..d085325b3 100644 --- a/x/transfer/keeper/keeper_test.go +++ b/x/transfer/keeper/keeper_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/neutron-org/neutron/v4/app/params" - "github.com/neutron-org/neutron/v4/testutil" - mock_types "github.com/neutron-org/neutron/v4/testutil/mocks/transfer/types" - "github.com/neutron-org/neutron/v4/testutil/transfer/keeper" - feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" - "github.com/neutron-org/neutron/v4/x/transfer/types" + "github.com/neutron-org/neutron/v5/app/params" + "github.com/neutron-org/neutron/v5/testutil" + mock_types "github.com/neutron-org/neutron/v5/testutil/mocks/transfer/types" + "github.com/neutron-org/neutron/v5/testutil/transfer/keeper" + feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" + "github.com/neutron-org/neutron/v5/x/transfer/types" ) const ( diff --git a/x/transfer/module.go b/x/transfer/module.go index 509470d61..0479b53b5 100644 --- a/x/transfer/module.go +++ b/x/transfer/module.go @@ -15,8 +15,8 @@ import ( "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - wrapkeeper "github.com/neutron-org/neutron/v4/x/transfer/keeper" - neutrontypes "github.com/neutron-org/neutron/v4/x/transfer/types" + wrapkeeper "github.com/neutron-org/neutron/v5/x/transfer/keeper" + neutrontypes "github.com/neutron-org/neutron/v5/x/transfer/types" ) /* diff --git a/x/transfer/types/expected_keepers.go b/x/transfer/types/expected_keepers.go index f13d094a0..5eb6f8edc 100644 --- a/x/transfer/types/expected_keepers.go +++ b/x/transfer/types/expected_keepers.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" ) type WasmKeeper interface { diff --git a/x/transfer/types/query.pb.go b/x/transfer/types/query.pb.go index 4d562d622..649f418da 100644 --- a/x/transfer/types/query.pb.go +++ b/x/transfer/types/query.pb.go @@ -30,30 +30,31 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("neutron/transfer/v1/query.proto", fileDescriptor_560cfedb574fdf6b) } var fileDescriptor_560cfedb574fdf6b = []byte{ - // 368 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x3f, 0x4b, 0x03, 0x31, - 0x18, 0xc6, 0x7b, 0x42, 0x0b, 0xc6, 0x45, 0x32, 0x96, 0x12, 0xa1, 0x74, 0xd0, 0xaa, 0x89, 0xd7, - 0x56, 0x3f, 0x80, 0x38, 0x38, 0x38, 0xa8, 0x38, 0xb9, 0x48, 0xee, 0x8c, 0x77, 0x07, 0x6d, 0x92, - 0x26, 0xb9, 0x62, 0x91, 0x2e, 0x7e, 0x02, 0xa1, 0x5f, 0xc1, 0x41, 0xc4, 0x0f, 0xe2, 0x58, 0x70, - 0x71, 0x94, 0xd6, 0x0f, 0x22, 0x97, 0xbb, 0xb3, 0x0a, 0xfe, 0xe9, 0x6d, 0x49, 0x78, 0x9e, 0xe7, - 0xfd, 0xe5, 0x7d, 0x13, 0xb0, 0xc6, 0x59, 0x6c, 0x94, 0xe0, 0xc4, 0x28, 0xca, 0xf5, 0x15, 0x53, - 0x64, 0xe0, 0x92, 0x7e, 0xcc, 0xd4, 0x10, 0x4b, 0x25, 0x8c, 0x80, 0xab, 0x99, 0x00, 0xe7, 0x82, - 0x6a, 0x2d, 0x10, 0x22, 0xe8, 0x32, 0x42, 0x65, 0x44, 0x28, 0xe7, 0xc2, 0x50, 0x13, 0x09, 0xae, - 0x53, 0x7d, 0x75, 0x3d, 0xf2, 0x7c, 0x42, 0xa5, 0xec, 0x46, 0x7e, 0x7a, 0xfe, 0x5b, 0x72, 0xeb, - 0xbe, 0x0c, 0xca, 0x27, 0xc9, 0x1e, 0x3e, 0x39, 0x00, 0x1c, 0x30, 0x2e, 0x7a, 0x67, 0x8a, 0xfa, - 0x0c, 0x76, 0x70, 0xe4, 0xf9, 0xf8, 0x6b, 0xc6, 0x67, 0x71, 0x3c, 0x70, 0xb1, 0xf5, 0xcc, 0xe5, - 0xa7, 0xac, 0x1f, 0x33, 0x6d, 0xaa, 0xbb, 0x05, 0x5d, 0x5a, 0x0a, 0xae, 0x59, 0xdd, 0xbd, 0x7d, - 0x79, 0x1f, 0x2f, 0x6d, 0xc2, 0x0d, 0x92, 0x81, 0x7f, 0x07, 0xbe, 0x4c, 0x1c, 0x17, 0x26, 0xb1, - 0x68, 0x72, 0x13, 0x52, 0x1d, 0x8e, 0xe0, 0x83, 0x03, 0x56, 0xe6, 0x49, 0x1a, 0x16, 0xab, 0xac, - 0x73, 0xe0, 0xbd, 0xa2, 0xb6, 0x8c, 0xb8, 0x69, 0x89, 0x1b, 0xb0, 0xfe, 0x3f, 0x31, 0x1c, 0x3b, - 0xa0, 0x72, 0x4c, 0x15, 0xed, 0x69, 0xb8, 0xb3, 0x40, 0xb9, 0x54, 0x9a, 0x03, 0xba, 0x05, 0x1c, - 0x19, 0x5b, 0xc3, 0xb2, 0x21, 0x58, 0xfb, 0x99, 0x4d, 0xa6, 0x28, 0x8f, 0x0e, 0x58, 0xb6, 0x37, - 0x3b, 0xa4, 0x3a, 0x84, 0xed, 0x45, 0xfb, 0x90, 0xa8, 0x73, 0xb6, 0x4e, 0x31, 0x53, 0x86, 0xd7, - 0xb2, 0x78, 0x5b, 0xb0, 0xf9, 0x57, 0xeb, 0x92, 0x21, 0x27, 0xc3, 0xb6, 0x2d, 0x1c, 0xed, 0x1f, - 0x3d, 0x4f, 0x91, 0x33, 0x99, 0x22, 0xe7, 0x6d, 0x8a, 0x9c, 0xbb, 0x19, 0x2a, 0x4d, 0x66, 0xa8, - 0xf4, 0x3a, 0x43, 0xa5, 0xf3, 0x56, 0x10, 0x99, 0x30, 0xf6, 0xb0, 0x2f, 0x7a, 0x24, 0xfb, 0x25, - 0xdb, 0x42, 0x05, 0xf9, 0x9a, 0x0c, 0x3a, 0xe4, 0x7a, 0x9e, 0x6f, 0x86, 0x92, 0x69, 0xaf, 0x62, - 0xdf, 0x7e, 0xfb, 0x23, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x46, 0x5b, 0xdc, 0x78, 0x03, 0x00, 0x00, + // 370 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xcd, 0x4a, 0x3b, 0x31, + 0x14, 0xc5, 0x3b, 0x7f, 0x68, 0xe1, 0x1f, 0x37, 0x92, 0x65, 0x29, 0x11, 0x4a, 0x17, 0x5a, 0x35, + 0x71, 0xfa, 0xe1, 0x03, 0x88, 0x0b, 0x17, 0x2e, 0x54, 0x5c, 0xb9, 0x91, 0xcc, 0x18, 0x67, 0x06, + 0xda, 0x24, 0x4d, 0x32, 0xc5, 0x22, 0xdd, 0xf8, 0x04, 0x42, 0x5f, 0xc1, 0x85, 0x88, 0x0f, 0xe2, + 0xb2, 0xe0, 0xc6, 0xa5, 0xb4, 0x3e, 0x88, 0x4c, 0x66, 0xc6, 0x2a, 0xf8, 0xd1, 0xd9, 0x25, 0xe1, + 0x9c, 0x73, 0x7f, 0xb9, 0x37, 0x01, 0x6b, 0x9c, 0xc5, 0x46, 0x09, 0x4e, 0x8c, 0xa2, 0x5c, 0x5f, + 0x32, 0x45, 0x86, 0x2e, 0x19, 0xc4, 0x4c, 0x8d, 0xb0, 0x54, 0xc2, 0x08, 0xb8, 0x9a, 0x09, 0x70, + 0x2e, 0xa8, 0xd6, 0x02, 0x21, 0x82, 0x1e, 0x23, 0x54, 0x46, 0x84, 0x72, 0x2e, 0x0c, 0x35, 0x91, + 0xe0, 0x3a, 0xd5, 0x57, 0xd7, 0x23, 0xcf, 0x27, 0x54, 0xca, 0x5e, 0xe4, 0xa7, 0xe7, 0x3f, 0x25, + 0xb7, 0xee, 0xca, 0xa0, 0x7c, 0x9c, 0xec, 0xe1, 0xa3, 0x03, 0xc0, 0x3e, 0xe3, 0xa2, 0x7f, 0xaa, + 0xa8, 0xcf, 0x60, 0x07, 0x47, 0x9e, 0x8f, 0x3f, 0x67, 0x7c, 0x14, 0xc7, 0x43, 0x17, 0x5b, 0xcf, + 0x42, 0x7e, 0xc2, 0x06, 0x31, 0xd3, 0xa6, 0xda, 0x2d, 0xe8, 0xd2, 0x52, 0x70, 0xcd, 0xea, 0xee, + 0xcd, 0xf3, 0xdb, 0xe4, 0xdf, 0x26, 0xdc, 0x20, 0x19, 0xf8, 0x57, 0xe0, 0x8b, 0xc4, 0x71, 0x6e, + 0x12, 0x8b, 0x26, 0xd7, 0x21, 0xd5, 0xe1, 0x18, 0xde, 0x3b, 0x60, 0x65, 0x91, 0xa4, 0x61, 0xb1, + 0xca, 0x3a, 0x07, 0xde, 0x2d, 0x6a, 0xcb, 0x88, 0x9b, 0x96, 0xb8, 0x01, 0xeb, 0x7f, 0x13, 0xc3, + 0x89, 0x03, 0x2a, 0x47, 0x54, 0xd1, 0xbe, 0x86, 0x3b, 0x4b, 0x94, 0x4b, 0xa5, 0x39, 0xa0, 0x5b, + 0xc0, 0x91, 0xb1, 0x35, 0x2c, 0x1b, 0x82, 0xb5, 0xef, 0xd9, 0x64, 0x8a, 0xf2, 0xe0, 0x80, 0xff, + 0xf6, 0x66, 0x07, 0x54, 0x87, 0xb0, 0xbd, 0x6c, 0x1f, 0x12, 0x75, 0xce, 0xd6, 0x29, 0x66, 0xca, + 0xf0, 0x5a, 0x16, 0x6f, 0x0b, 0x36, 0x7f, 0x6b, 0x5d, 0x32, 0xe4, 0x64, 0xd8, 0xb6, 0x85, 0xe3, + 0xbd, 0xc3, 0xa7, 0x19, 0x72, 0xa6, 0x33, 0xe4, 0xbc, 0xce, 0x90, 0x73, 0x3b, 0x47, 0xa5, 0xe9, + 0x1c, 0x95, 0x5e, 0xe6, 0xa8, 0x74, 0xd6, 0x0a, 0x22, 0x13, 0xc6, 0x1e, 0xf6, 0x45, 0x9f, 0x64, + 0xbf, 0x64, 0x5b, 0xa8, 0x20, 0x5f, 0x93, 0x61, 0x97, 0x5c, 0x2d, 0xf2, 0xcd, 0x48, 0x32, 0xed, + 0x55, 0xec, 0xdb, 0x6f, 0xbf, 0x07, 0x00, 0x00, 0xff, 0xff, 0x63, 0xe0, 0x46, 0x3b, 0x78, 0x03, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/transfer/types/tx.go b/x/transfer/types/tx.go index ada5bc1ae..e87ce7e09 100644 --- a/x/transfer/types/tx.go +++ b/x/transfer/types/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" "google.golang.org/grpc" - feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types" + feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/transfer/types/tx.pb.go b/x/transfer/types/tx.pb.go index 94361dafa..b2e46f9df 100644 --- a/x/transfer/types/tx.pb.go +++ b/x/transfer/types/tx.pb.go @@ -13,7 +13,7 @@ import ( proto "github.com/cosmos/gogoproto/proto" types3 "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" types1 "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" - types2 "github.com/neutron-org/neutron/v4/x/feerefunder/types" + types2 "github.com/neutron-org/neutron/v5/x/feerefunder/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -234,50 +234,50 @@ func init() { func init() { proto.RegisterFile("neutron/transfer/v1/tx.proto", fileDescriptor_c44193c4a9c18e30) } var fileDescriptor_c44193c4a9c18e30 = []byte{ - // 686 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4f, 0x6f, 0xd3, 0x4a, - 0x10, 0x8f, 0x5f, 0xd2, 0xb4, 0xdd, 0xbc, 0xfe, 0x79, 0xdb, 0xf7, 0x5a, 0x37, 0x6a, 0xed, 0x3e, - 0x0b, 0xa4, 0x52, 0xc4, 0x9a, 0x04, 0x10, 0x52, 0x4f, 0x28, 0x95, 0x10, 0x95, 0xa8, 0x14, 0x59, - 0xe5, 0x82, 0x90, 0x8a, 0xe3, 0x4c, 0x1c, 0x8b, 0x78, 0xd7, 0xec, 0x6e, 0xa2, 0xf6, 0x82, 0x10, - 0xa7, 0x1e, 0xf9, 0x08, 0xfd, 0x08, 0xfd, 0x00, 0x7c, 0x80, 0x1e, 0x7b, 0xe4, 0x14, 0xa1, 0xf6, - 0x50, 0xce, 0xbd, 0x72, 0x41, 0x5e, 0xaf, 0xd3, 0xa4, 0x42, 0x70, 0xca, 0xcc, 0xfc, 0x7e, 0x33, - 0xe3, 0xf9, 0xcd, 0x6c, 0xd0, 0x1a, 0x85, 0xbe, 0xe4, 0x8c, 0xba, 0x92, 0xfb, 0x54, 0x74, 0x80, - 0xbb, 0x83, 0x9a, 0x2b, 0x0f, 0x49, 0xc2, 0x99, 0x64, 0x78, 0x51, 0xa3, 0x24, 0x47, 0xab, 0x56, - 0xc0, 0x44, 0xcc, 0x84, 0xdb, 0xf2, 0x05, 0xb8, 0x83, 0x5a, 0x0b, 0xa4, 0x5f, 0x73, 0x03, 0x16, - 0xd1, 0x2c, 0xa3, 0xba, 0xa2, 0xf1, 0x58, 0x84, 0x69, 0xa5, 0x58, 0x84, 0x1a, 0xf8, 0x37, 0x64, - 0x21, 0x53, 0xa6, 0x9b, 0x5a, 0x3a, 0x7a, 0x3f, 0x6a, 0x05, 0xae, 0x9f, 0x24, 0xbd, 0x28, 0xf0, - 0x65, 0xc4, 0xa8, 0x98, 0xfc, 0x0e, 0x6d, 0x6b, 0xb2, 0x9d, 0x92, 0x03, 0xc6, 0xc1, 0x0d, 0x7a, - 0x11, 0x50, 0x99, 0x52, 0x32, 0x4b, 0x13, 0xd6, 0xf3, 0x61, 0x3a, 0x00, 0x1c, 0x3a, 0x7d, 0xda, - 0x06, 0x9e, 0xda, 0x19, 0xec, 0xfc, 0x28, 0xa2, 0xca, 0x9e, 0x08, 0xf7, 0x75, 0x55, 0xfc, 0x14, - 0x55, 0x04, 0xeb, 0xf3, 0x00, 0x0e, 0x12, 0xc6, 0xa5, 0x69, 0x6c, 0x18, 0x9b, 0xb3, 0x8d, 0xe5, - 0xeb, 0xa1, 0x8d, 0x8f, 0xfc, 0xb8, 0xb7, 0xed, 0x8c, 0x81, 0x8e, 0x87, 0x32, 0xaf, 0xc9, 0xb8, - 0xc4, 0xcf, 0xd0, 0xbc, 0xc6, 0x82, 0xae, 0x4f, 0x29, 0xf4, 0xcc, 0xbf, 0x54, 0xee, 0xea, 0xf5, - 0xd0, 0xfe, 0x6f, 0x22, 0x57, 0xe3, 0x8e, 0x37, 0x97, 0x05, 0x76, 0x32, 0x1f, 0x3f, 0x41, 0x53, - 0x92, 0xbd, 0x03, 0x6a, 0x16, 0x37, 0x8c, 0xcd, 0x4a, 0x7d, 0x95, 0x64, 0xb2, 0x91, 0x54, 0x56, - 0xa2, 0x65, 0x25, 0x3b, 0x2c, 0xa2, 0x8d, 0xd2, 0xd9, 0xd0, 0x2e, 0x78, 0x19, 0x1b, 0x2f, 0xa3, - 0xb2, 0x80, 0x74, 0x2a, 0xb3, 0x94, 0x36, 0xf4, 0xb4, 0x87, 0xab, 0x68, 0x86, 0x43, 0x00, 0xd1, - 0x00, 0xb8, 0x39, 0xa5, 0x90, 0x91, 0x8f, 0xdf, 0xa2, 0x79, 0x19, 0xc5, 0xc0, 0xfa, 0xf2, 0xa0, - 0x0b, 0x51, 0xd8, 0x95, 0x66, 0x59, 0xf5, 0xac, 0x92, 0xa8, 0x15, 0x90, 0x54, 0x4e, 0xa2, 0x45, - 0x1c, 0xd4, 0xc8, 0x0b, 0xc5, 0x68, 0xac, 0xa7, 0x4d, 0x6f, 0x86, 0x99, 0xcc, 0x77, 0xbc, 0x39, - 0x1d, 0xc8, 0xd8, 0x78, 0x17, 0xfd, 0x93, 0x33, 0xd2, 0x5f, 0x21, 0xfd, 0x38, 0x31, 0xa7, 0x37, - 0x8c, 0xcd, 0x52, 0x63, 0xed, 0x7a, 0x68, 0x9b, 0x93, 0x45, 0x46, 0x14, 0xc7, 0x5b, 0xd4, 0xb1, - 0xfd, 0x3c, 0x84, 0x31, 0x2a, 0xc5, 0x10, 0x33, 0x73, 0x46, 0x0d, 0xa1, 0x6c, 0xfc, 0x10, 0x15, - 0x3b, 0x00, 0xe6, 0xac, 0xfa, 0x6a, 0x93, 0xe4, 0x27, 0x39, 0xb6, 0x63, 0xf2, 0x1c, 0x40, 0x0b, - 0x95, 0x52, 0xb7, 0x97, 0x8e, 0x4f, 0xec, 0xc2, 0xf7, 0x13, 0xbb, 0xf0, 0xe9, 0xea, 0x74, 0x4b, - 0x6b, 0xe4, 0x34, 0xd1, 0xd2, 0xd8, 0xf2, 0x3d, 0x10, 0x09, 0xa3, 0x02, 0xb0, 0x8d, 0x2a, 0x02, - 0xde, 0xf7, 0x81, 0x06, 0x70, 0x10, 0xb5, 0xd5, 0x11, 0x94, 0x3c, 0x94, 0x87, 0x76, 0xdb, 0xd8, - 0x44, 0xd3, 0x13, 0x5b, 0xf6, 0x72, 0xd7, 0xf9, 0x80, 0x16, 0xf6, 0x44, 0xf8, 0x2a, 0x69, 0xfb, - 0x12, 0x9a, 0x3e, 0xf7, 0x63, 0xa1, 0x16, 0x14, 0x85, 0x14, 0x78, 0x76, 0x4d, 0x9e, 0xf6, 0x70, - 0x03, 0x95, 0x13, 0xc5, 0x50, 0x35, 0x2a, 0xf5, 0x3b, 0x4a, 0xfc, 0xf1, 0xc3, 0x1f, 0x3d, 0xb1, - 0x74, 0x0d, 0x59, 0x35, 0x3d, 0x92, 0xce, 0xdc, 0x5e, 0x38, 0x1e, 0x4d, 0xa4, 0x8a, 0x3a, 0xab, - 0x68, 0xe5, 0x56, 0xff, 0x7c, 0xaa, 0xfa, 0x17, 0x03, 0x15, 0xf7, 0x44, 0x88, 0x9b, 0x68, 0x66, - 0x74, 0xee, 0xeb, 0xe4, 0xf6, 0x6b, 0x26, 0x63, 0x82, 0x54, 0xef, 0xfe, 0x16, 0x1e, 0xe9, 0xf5, - 0x06, 0xfd, 0x3d, 0x31, 0xf1, 0xff, 0xbf, 0x4c, 0x1b, 0xa7, 0x54, 0xef, 0xfd, 0x91, 0x92, 0x57, - 0xaf, 0x4e, 0x7d, 0xbc, 0x3a, 0xdd, 0x32, 0x1a, 0x2f, 0xcf, 0x2e, 0x2c, 0xe3, 0xfc, 0xc2, 0x32, - 0xbe, 0x5d, 0x58, 0xc6, 0xe7, 0x4b, 0xab, 0x70, 0x7e, 0x69, 0x15, 0xbe, 0x5e, 0x5a, 0x85, 0xd7, - 0xf5, 0x30, 0x92, 0xdd, 0x7e, 0x8b, 0x04, 0x2c, 0x76, 0x75, 0xd5, 0x07, 0x8c, 0x87, 0xb9, 0xed, - 0x0e, 0x1e, 0xbb, 0x87, 0x37, 0xff, 0x21, 0xf2, 0x28, 0x01, 0xd1, 0x2a, 0xab, 0xe7, 0xff, 0xe8, - 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x33, 0x1a, 0x12, 0x42, 0xec, 0x04, 0x00, 0x00, + // 685 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4f, 0x4f, 0xdb, 0x4a, + 0x10, 0x8f, 0x5f, 0x42, 0x80, 0xcd, 0xe3, 0xcf, 0x5b, 0xde, 0x03, 0x13, 0x81, 0xcd, 0xb3, 0x5a, + 0x89, 0x52, 0x75, 0xdd, 0xa4, 0x42, 0x95, 0x38, 0x55, 0x41, 0xaa, 0x8a, 0x54, 0xa4, 0xc8, 0xa2, + 0x97, 0xaa, 0x12, 0x75, 0x9c, 0x89, 0x63, 0x35, 0xde, 0x75, 0x77, 0x37, 0x11, 0x5c, 0xaa, 0xaa, + 0x27, 0x8e, 0xfd, 0x08, 0x7c, 0x04, 0x3e, 0x40, 0x3f, 0x00, 0x47, 0x8e, 0x3d, 0x45, 0x15, 0x1c, + 0xe8, 0x99, 0x6b, 0x2f, 0x95, 0xd7, 0xeb, 0x90, 0xa0, 0xaa, 0x3d, 0x65, 0x66, 0x7e, 0xbf, 0x99, + 0xf1, 0xfc, 0x66, 0x36, 0x68, 0x8d, 0x42, 0x5f, 0x72, 0x46, 0x5d, 0xc9, 0x7d, 0x2a, 0x3a, 0xc0, + 0xdd, 0x41, 0xcd, 0x95, 0x47, 0x24, 0xe1, 0x4c, 0x32, 0xbc, 0xa8, 0x51, 0x92, 0xa3, 0x55, 0x2b, + 0x60, 0x22, 0x66, 0xc2, 0x6d, 0xf9, 0x02, 0xdc, 0x41, 0xad, 0x05, 0xd2, 0xaf, 0xb9, 0x01, 0x8b, + 0x68, 0x96, 0x51, 0x5d, 0xd1, 0x78, 0x2c, 0xc2, 0xb4, 0x52, 0x2c, 0x42, 0x0d, 0xfc, 0x1b, 0xb2, + 0x90, 0x29, 0xd3, 0x4d, 0x2d, 0x1d, 0x7d, 0x18, 0xb5, 0x02, 0xd7, 0x4f, 0x92, 0x5e, 0x14, 0xf8, + 0x32, 0x62, 0x54, 0x4c, 0x7e, 0x87, 0xb6, 0x35, 0xd9, 0x4e, 0xc9, 0x01, 0xe3, 0xe0, 0x06, 0xbd, + 0x08, 0xa8, 0x4c, 0x29, 0x99, 0xa5, 0x09, 0xeb, 0xf9, 0x30, 0x1d, 0x00, 0x0e, 0x9d, 0x3e, 0x6d, + 0x03, 0x4f, 0xed, 0x0c, 0x76, 0x7e, 0x14, 0x51, 0x65, 0x5f, 0x84, 0x07, 0xba, 0x2a, 0x7e, 0x8a, + 0x2a, 0x82, 0xf5, 0x79, 0x00, 0x87, 0x09, 0xe3, 0xd2, 0x34, 0x36, 0x8c, 0xcd, 0xd9, 0xc6, 0xf2, + 0xcd, 0xd0, 0xc6, 0xc7, 0x7e, 0xdc, 0xdb, 0x71, 0xc6, 0x40, 0xc7, 0x43, 0x99, 0xd7, 0x64, 0x5c, + 0xe2, 0x67, 0x68, 0x5e, 0x63, 0x41, 0xd7, 0xa7, 0x14, 0x7a, 0xe6, 0x5f, 0x2a, 0x77, 0xf5, 0x66, + 0x68, 0xff, 0x37, 0x91, 0xab, 0x71, 0xc7, 0x9b, 0xcb, 0x02, 0xbb, 0x99, 0x8f, 0xb7, 0xd1, 0x94, + 0x64, 0xef, 0x80, 0x9a, 0xc5, 0x0d, 0x63, 0xb3, 0x52, 0x5f, 0x25, 0x99, 0x6c, 0x24, 0x95, 0x95, + 0x68, 0x59, 0xc9, 0x2e, 0x8b, 0x68, 0xa3, 0x74, 0x3e, 0xb4, 0x0b, 0x5e, 0xc6, 0xc6, 0xcb, 0xa8, + 0x2c, 0x20, 0x9d, 0xca, 0x2c, 0xa5, 0x0d, 0x3d, 0xed, 0xe1, 0x2a, 0x9a, 0xe1, 0x10, 0x40, 0x34, + 0x00, 0x6e, 0x4e, 0x29, 0x64, 0xe4, 0xe3, 0xb7, 0x68, 0x5e, 0x46, 0x31, 0xb0, 0xbe, 0x3c, 0xec, + 0x42, 0x14, 0x76, 0xa5, 0x59, 0x56, 0x3d, 0xab, 0x24, 0x6a, 0x05, 0x24, 0x95, 0x93, 0x68, 0x11, + 0x07, 0x35, 0xf2, 0x42, 0x31, 0x1a, 0xeb, 0x69, 0xd3, 0xdb, 0x61, 0x26, 0xf3, 0x1d, 0x6f, 0x4e, + 0x07, 0x32, 0x36, 0xde, 0x43, 0xff, 0xe4, 0x8c, 0xf4, 0x57, 0x48, 0x3f, 0x4e, 0xcc, 0xe9, 0x0d, + 0x63, 0xb3, 0xd4, 0x58, 0xbb, 0x19, 0xda, 0xe6, 0x64, 0x91, 0x11, 0xc5, 0xf1, 0x16, 0x75, 0xec, + 0x20, 0x0f, 0x61, 0x8c, 0x4a, 0x31, 0xc4, 0xcc, 0x9c, 0x51, 0x43, 0x28, 0x1b, 0x3f, 0x46, 0xc5, + 0x0e, 0x80, 0x39, 0xab, 0xbe, 0xda, 0x24, 0xf9, 0x49, 0x8e, 0xed, 0x98, 0x3c, 0x07, 0xd0, 0x42, + 0xa5, 0xd4, 0x9d, 0xa5, 0x93, 0x53, 0xbb, 0xf0, 0xfd, 0xd4, 0x2e, 0x7c, 0xba, 0x3e, 0xdb, 0xd2, + 0x1a, 0x39, 0x4d, 0xb4, 0x34, 0xb6, 0x7c, 0x0f, 0x44, 0xc2, 0xa8, 0x00, 0x6c, 0xa3, 0x8a, 0x80, + 0xf7, 0x7d, 0xa0, 0x01, 0x1c, 0x46, 0x6d, 0x75, 0x04, 0x25, 0x0f, 0xe5, 0xa1, 0xbd, 0x36, 0x36, + 0xd1, 0xf4, 0xc4, 0x96, 0xbd, 0xdc, 0x75, 0x3e, 0xa0, 0x85, 0x7d, 0x11, 0xbe, 0x4a, 0xda, 0xbe, + 0x84, 0xa6, 0xcf, 0xfd, 0x58, 0xa8, 0x05, 0x45, 0x21, 0x05, 0x9e, 0x5d, 0x93, 0xa7, 0x3d, 0xdc, + 0x40, 0xe5, 0x44, 0x31, 0x54, 0x8d, 0x4a, 0xfd, 0x9e, 0x12, 0x7f, 0xfc, 0xf0, 0x47, 0x4f, 0x2c, + 0x5d, 0x43, 0x56, 0x4d, 0x8f, 0xa4, 0x33, 0x77, 0x16, 0x4e, 0x46, 0x13, 0xa9, 0xa2, 0xce, 0x2a, + 0x5a, 0xb9, 0xd3, 0x3f, 0x9f, 0xaa, 0xfe, 0xc5, 0x40, 0xc5, 0x7d, 0x11, 0xe2, 0x26, 0x9a, 0x19, + 0x9d, 0xfb, 0x3a, 0xb9, 0xfb, 0x9a, 0xc9, 0x98, 0x20, 0xd5, 0xfb, 0xbf, 0x85, 0x47, 0x7a, 0xbd, + 0x41, 0x7f, 0x4f, 0x4c, 0xfc, 0xff, 0x2f, 0xd3, 0xc6, 0x29, 0xd5, 0x07, 0x7f, 0xa4, 0xe4, 0xd5, + 0xab, 0x53, 0x1f, 0xaf, 0xcf, 0xb6, 0x8c, 0xc6, 0xcb, 0xf3, 0x4b, 0xcb, 0xb8, 0xb8, 0xb4, 0x8c, + 0x6f, 0x97, 0x96, 0xf1, 0xf9, 0xca, 0x2a, 0x5c, 0x5c, 0x59, 0x85, 0xaf, 0x57, 0x56, 0xe1, 0x75, + 0x3d, 0x8c, 0x64, 0xb7, 0xdf, 0x22, 0x01, 0x8b, 0x5d, 0x5d, 0xf5, 0x11, 0xe3, 0x61, 0x6e, 0xbb, + 0x83, 0x6d, 0xf7, 0xe8, 0xf6, 0x3f, 0x44, 0x1e, 0x27, 0x20, 0x5a, 0x65, 0xf5, 0xfc, 0x9f, 0xfc, + 0x0c, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xbc, 0x0f, 0xa5, 0xec, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.